svn commit: samba r14556 - in branches/SAMBA_4_0/source: . heimdal/lib/asn1 heimdal/lib/com_err heimdal/lib/roken heimdal/lib/vers heimdal_build lib/replace lib/util

jelmer at samba.org jelmer at samba.org
Sun Mar 19 03:14:56 GMT 2006


Author: jelmer
Date: 2006-03-19 03:14:56 +0000 (Sun, 19 Mar 2006)
New Revision: 14556

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14556

Log:
Fix some dependencies

Modified:
   branches/SAMBA_4_0/source/heimdal/lib/asn1/
   branches/SAMBA_4_0/source/heimdal/lib/com_err/
   branches/SAMBA_4_0/source/heimdal/lib/roken/
   branches/SAMBA_4_0/source/heimdal/lib/vers/
   branches/SAMBA_4_0/source/heimdal_build/
   branches/SAMBA_4_0/source/heimdal_build/config.mk
   branches/SAMBA_4_0/source/lib/replace/
   branches/SAMBA_4_0/source/lib/util/util.h
   branches/SAMBA_4_0/source/main.mk


Changeset:

Property changes on: branches/SAMBA_4_0/source/heimdal/lib/asn1
___________________________________________________________________
Name: svn:ignore
   - .sconsign
.sconsign
*.d
*.ho
asn1*.c
*.x
y.*
lex.*
parse.*
*asn1_files
asn1_err.h
krb5_asn1.h



   + *.hd
*.d
*.ho
asn1*.c
*.x
y.*
lex.*
parse.*
*asn1_files
asn1_err.h
krb5_asn1.h





Property changes on: branches/SAMBA_4_0/source/heimdal/lib/com_err
___________________________________________________________________
Name: svn:ignore
   - .sconsign
*.d
*.ho
lex.*
parse.*
y.*


   + *.hd
.sconsign
*.d
*.ho
lex.*
parse.*
y.*




Property changes on: branches/SAMBA_4_0/source/heimdal/lib/roken
___________________________________________________________________
Name: svn:ignore
   - .sconsign
vis.h
err.h
*.d
*.ho

   + *.hd
.sconsign
vis.h
err.h
*.d
*.ho



Property changes on: branches/SAMBA_4_0/source/heimdal/lib/vers
___________________________________________________________________
Name: svn:ignore
   - *.d
.sconsign
*.ho

   + *.hd
*.d
*.ho



Property changes on: branches/SAMBA_4_0/source/heimdal_build
___________________________________________________________________
Name: svn:ignore
   - *.d
*.ho

   + *.hd
*.d
*.ho


Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-03-19 02:55:44 UTC (rev 14555)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-03-19 03:14:56 UTC (rev 14556)
@@ -431,6 +431,17 @@
 ./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}


Property changes on: branches/SAMBA_4_0/source/lib/replace
___________________________________________________________________
Name: svn:ignore
   - readline.h
*.d
*.ho

   + *.hd
readline.h
*.d
*.ho


Modified: branches/SAMBA_4_0/source/lib/util/util.h
===================================================================
--- branches/SAMBA_4_0/source/lib/util/util.h	2006-03-19 02:55:44 UTC (rev 14555)
+++ branches/SAMBA_4_0/source/lib/util/util.h	2006-03-19 03:14:56 UTC (rev 14556)
@@ -40,7 +40,7 @@
 #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 

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-03-19 02:55:44 UTC (rev 14555)
+++ branches/SAMBA_4_0/source/main.mk	2006-03-19 03:14:56 UTC (rev 14556)
@@ -312,19 +312,23 @@
 # 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 @@
 .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:



More information about the samba-cvs mailing list