summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-19 03:14:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:46 -0500
commit7b01c9e0c464c37ee878ada65fef2c67f1f55e53 (patch)
tree4365372708557602dd7f20b1b80bf40b9fcbd2a2 /source4
parent1ac632a45bb7eed5b439404a41266a9572528e07 (diff)
downloadsamba-7b01c9e0c464c37ee878ada65fef2c67f1f55e53.tar.gz
samba-7b01c9e0c464c37ee878ada65fef2c67f1f55e53.tar.bz2
samba-7b01c9e0c464c37ee878ada65fef2c67f1f55e53.zip
r14556: Fix some dependencies
(This used to be commit b5802770322678d3f9c2044039cc254024612f9b)
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/config.mk11
-rw-r--r--source4/lib/util/util.h2
-rw-r--r--source4/main.mk10
3 files changed, 19 insertions, 4 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 6b10ac7096..26b6083717 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -431,6 +431,17 @@ include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et|
./heimdal/lib/krb5/replay.c: ./heimdal/lib/roken/vis.h
./heimdal/lib/roken/vis.c: ./heimdal/lib/roken/vis.h
+heimdal/lib/krb5/krb5.h: heimdal/lib/asn1/asn1_err.h \
+ heimdal/lib/krb5/krb5_err.h
+
+heimdal/lib/gssapi/asn1_ContextFlags.c: heimdal/lib/gssapi/spnego_asn1.h
+heimdal/lib/gssapi/asn1_MechType.c: heimdal/lib/gssapi/spnego_asn1.h
+heimdal/lib/gssapi/asn1_MechTypeList.c: heimdal/lib/gssapi/spnego_asn1.h
+heimdal/lib/gssapi/asn1_NegTokenInit.c: heimdal/lib/gssapi/spnego_asn1.h
+heimdal/lib/gssapi/asn1_NegTokenTarg.c: heimdal/lib/gssapi/spnego_asn1.h
+heimdal/lib/gssapi/asn1_NegotiationToken.c: heimdal/lib/gssapi/spnego_asn1.h
+
+
clean::
@-rm -f heimdal/lib/roken/vis.h heimdal/lib/roken/err.h
@-rm -f heimdal/lib/asn1/asn1_err.{c,h}
diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h
index d6b412ee71..73fb675e28 100644
--- a/source4/lib/util/util.h
+++ b/source4/lib/util/util.h
@@ -40,7 +40,7 @@ struct smbsrv_tcon;
#include "util/debug.h"
#include "util/mutex.h"
#include "util/byteorder.h"
-#include "util/util_proto.h"
+#include "lib/util/util_proto.h"
/**
* zero a structure
diff --git a/source4/main.mk b/source4/main.mk
index 592d6c50e1..e9ff907ada 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -312,19 +312,23 @@ unused_macros:
# File types
###############################################################################
-.SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho .hin .idl
+.SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho .hin .idl .hd
.hin.h:
@cp $< $@
.c.ho:
@echo "Compiling $< with host compiler"
- @$(HOSTCC) `script/cflags.pl $@` $(CFLAGS) -c $*.c -o $@
+ @$(HOSTCC) `script/cflags.pl $@` $(CFLAGS) -c $< -o $@
.c.d:
@echo "Generating dependencies for $<"
@$(CC) -M -MG -MT $(<:.c=.o) `script/cflags.pl $@` $(CFLAGS) $< -o $@
+.c.hd:
+ @echo "Generating dependencies for $<"
+ @$(CC) -M -MG -MT $(<:.c=.ho) `script/cflags.pl $@` $(CFLAGS) $< -o $@
+
include/includes.d: include/includes.h
@echo "Generating dependencies for $<"
@$(CC) -M -MG -MT include/includes.h.gch $(CFLAGS) $< -o $@
@@ -366,7 +370,7 @@ DOCBOOK_MANPAGE_URL = http://docbook.sourceforge.net/release/xsl/current/manpage
.8.xml.8:
$(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
-DEP_FILES = $(patsubst %.ho,%.d,$(patsubst %.o,%.d,$(ALL_OBJS))) \
+DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
include/includes.d
clean-deps: