diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 08:11:05 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 08:11:05 +1000 |
commit | 51ae2302a68033b1b79a4ebc8d4cbab64adcf843 (patch) | |
tree | d8b1af54efe4ec70607ef2bcbd873c2cd667d894 /source4/static_deps.mk | |
parent | 5d0d239d1ab826c91839a603f93d2c0061658888 (diff) | |
parent | 52b230141b5ad9f317f97e7d257703614bab3985 (diff) | |
download | samba-51ae2302a68033b1b79a4ebc8d4cbab64adcf843.tar.gz samba-51ae2302a68033b1b79a4ebc8d4cbab64adcf843.tar.bz2 samba-51ae2302a68033b1b79a4ebc8d4cbab64adcf843.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
It seems the format of main.mk changed in my sleep...
Conflicts:
source/main.mk
(This used to be commit 56f2288e4f4f1aa70d11fc5f118458baf5803627)
Diffstat (limited to 'source4/static_deps.mk')
-rw-r--r-- | source4/static_deps.mk | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/source4/static_deps.mk b/source4/static_deps.mk index 7eb8fa10fe..de59d76e28 100644 --- a/source4/static_deps.mk +++ b/source4/static_deps.mk @@ -14,29 +14,29 @@ include/includes.h: \ librpc/gen_ndr/misc.h heimdal_basics: \ - heimdal/lib/hdb/hdb_asn1.h \ - heimdal/lib/gssapi/spnego_asn1.h \ - heimdal/lib/gssapi/gssapi_asn1.h \ - heimdal/lib/asn1/krb5_asn1.h \ - heimdal/lib/asn1/asn1_err.h \ - heimdal/lib/asn1/digest_asn1.h \ - heimdal/lib/asn1/pkcs8_asn1.h \ - heimdal/lib/asn1/pkcs9_asn1.h \ - heimdal/lib/asn1/pkcs12_asn1.h \ - heimdal/lib/asn1/cms_asn1.h \ - heimdal/lib/asn1/rfc2459_asn1.h \ - heimdal/lib/asn1/pkinit_asn1.h \ - heimdal/lib/asn1/kx509_asn1.h \ - heimdal/lib/hx509/ocsp_asn1.h \ - heimdal/lib/hx509/pkcs10_asn1.h \ - heimdal/lib/hdb/hdb_err.h \ - heimdal/lib/krb5/heim_err.h \ - heimdal/lib/krb5/k524_err.h \ - heimdal/lib/krb5/krb_err.h \ - heimdal/lib/krb5/krb5_err.h \ - heimdal/lib/gssapi/gkrb5_err.h \ - heimdal/lib/hx509/hx509_err.h \ - heimdal/lib/wind/wind_err.h + $(heimdalsrcdir)/lib/hdb/hdb_asn1.h \ + $(heimdalsrcdir)/lib/gssapi/spnego_asn1.h \ + $(heimdalsrcdir)/lib/gssapi/gssapi_asn1.h \ + $(heimdalsrcdir)/lib/asn1/krb5_asn1.h \ + $(heimdalsrcdir)/lib/asn1/asn1_err.h \ + $(heimdalsrcdir)/lib/asn1/digest_asn1.h \ + $(heimdalsrcdir)/lib/asn1/pkcs8_asn1.h \ + $(heimdalsrcdir)/lib/asn1/pkcs9_asn1.h \ + $(heimdalsrcdir)/lib/asn1/pkcs12_asn1.h \ + $(heimdalsrcdir)/lib/asn1/cms_asn1.h \ + $(heimdalsrcdir)/lib/asn1/rfc2459_asn1.h \ + $(heimdalsrcdir)/lib/asn1/pkinit_asn1.h \ + $(heimdalsrcdir)/lib/asn1/kx509_asn1.h \ + $(heimdalsrcdir)/lib/hx509/ocsp_asn1.h \ + $(heimdalsrcdir)/lib/hx509/pkcs10_asn1.h \ + $(heimdalsrcdir)/lib/hdb/hdb_err.h \ + $(heimdalsrcdir)/lib/krb5/heim_err.h \ + $(heimdalsrcdir)/lib/krb5/k524_err.h \ + $(heimdalsrcdir)/lib/krb5/krb_err.h \ + $(heimdalsrcdir)/lib/krb5/krb5_err.h \ + $(heimdalsrcdir)/lib/gssapi/gkrb5_err.h \ + $(heimdalsrcdir)/lib/hx509/hx509_err.h \ + $(heimdalsrcdir)/lib/wind/wind_err.h proto:: basics:: include/includes.h idl proto heimdal_basics |