This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...

[ira/wip.git] / source3 / Makefile.in

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ecd50b93051f78f87670f0b9ded16f865f35ec1a..476997512fa4671f63a36b195fec2beb9838127c 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -442,8 +442,7 @@ WINBINDD_OBJ1 = \
                nsswitch/winbindd_cm.o \
                nsswitch/winbindd_wins.o \
                nsswitch/winbindd_rpc.o \
-               nsswitch/winbindd_ads.o \
-               nsswitch/winbindd_dual.o
+               nsswitch/winbindd_ads.o
 
 WINBINDD_OBJ = \
                $(WINBINDD_OBJ1) $(NOPROTO_OBJ) $(PASSDB_OBJ) \
@@ -641,7 +640,7 @@ bin/smbpasswd: $(SMBPASSWD_OBJ) bin/.dummy
 
 bin/pdbedit: $(PDBEDIT_OBJ) bin/.dummy
        @echo Linking $@
-       @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @BUILD_POPT@
+       @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
 
 bin/smbgroupedit: $(SMBGROUPEDIT_OBJ) bin/.dummy
        @echo Linking $@
@@ -833,30 +832,32 @@ winbindd_proto:
          $(WINBINDD_OBJ1)
 
 delheaders:
-       @/bin/rm -f $(srcdir)/include/proto.h $(srcdir)/include/build_env.h 
-       @/bin/rm -f $(srcdir)/include/wrepld_proto.h $(srcdir)/nsswitch/winbindd_proto.h 
-       @/bin/rm -f include/proto.h include/build_env.h include/wrepld_proto.h nsswitch/winbindd_proto.h 
+       @/bin/rm -f $(srcdir)/include/proto.h $(srcdir)/include/build_env.h
+       @/bin/rm -f include/proto.h include/build_env.h
+
+# we want our generated headers to be rebuilt if they don't exist, but not rebuilt every time
+.headers.stamp:
+       @[ -f $@ ] || touch $@
+
+$(PROTO_OBJ) : .headers.stamp
 
 include/proto.h:
-       @echo Building include/proto.h
+       @echo rebuilding include/proto.h
        @cd $(srcdir) && $(AWK) -f script/mkproto.awk `echo $(PROTO_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | egrep -v 'ubiqx/|wrapped'` > $(builddir)/include/proto.h
 
 include/build_env.h:
-       @echo Building include/build_env.h
+       @echo rebuilding include/build_env.h
        @cd $(srcdir) && $(SHELL) script/build_env.sh $(srcdir) $(builddir) $(CC) > $(builddir)/include/build_env.h
 
 include/wrepld_proto.h:
-       @echo Building include/wrepld_proto.h
+       @echo rebuilding include/wrepld_proto.h
        @cd $(srcdir) && $(SHELL) script/mkproto.sh $(AWK) \
          -h _WREPLD_PROTO_H_ $(builddir)/include/wrepld_proto.h \
          $(WREPL_OBJ1)
 
-headers: 
-       $(MAKE) delheaders include/proto.h include/build_env.h include/wrepld_proto.h winbindd_proto
-
-proto: headers 
+headers: delheaders include/proto.h include/build_env.h include/wrepld_proto.h .headers.stamp
 
-.PHONY: headers proto
+proto: headers winbindd_proto
 
 etags:
        etags `find $(srcdir) -name "*.[ch]" | grep -v /CVS/`