[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2650-g405ef74

[Günther Deschner]

The branch, v3-2-test has been updated
       via  405ef74d7e9ef614ea39b7cfd1d57307d9490545 (commit)
      from  bc2d3d51449831146a9faf6e809e7a91d174659c (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 405ef74d7e9ef614ea39b7cfd1d57307d9490545
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Fri Feb 29 02:49:27 2008 +0100

    Trying to fix libnetapi examples Makefile.in.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/lib/netapi/examples/Makefile.in |   33 ++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/examples/Makefile.in 
b/source/lib/netapi/examples/Makefile.in
index 86e1b1b..6de3e65 100644
--- a/source/lib/netapi/examples/Makefile.in
+++ b/source/lib/netapi/examples/Makefile.in
@@ -3,7 +3,7 @@ GTK_LIBS=`pkg-config gtk+-2.0 --libs`
 
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
[EMAIL PROTECTED]@ -lnetapi
[EMAIL PROTECTED]@ -lnetapi -ltdb -ltalloc
 [EMAIL PROTECTED]@
 FLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS)
 [EMAIL PROTECTED]@
@@ -14,7 +14,12 @@ [EMAIL PROTECTED]@
 COMPILE_CC = $(CC) -I. $(FLAGS) $(PICFLAG) -c $< -o $@
 COMPILE = $(COMPILE_CC)
 
-BINARY_PREREQS = proto_exists bin/.dummy
+PROGS = bin/[EMAIL PROTECTED]@ \
+       bin/[EMAIL PROTECTED]@ \
+       bin/[EMAIL PROTECTED]@ \
+       bin/[EMAIL PROTECTED]@
+
+all: $(PROGS)
 
 MAKEDIR = || exec false; \
          if test -d "$$dir"; then :; else \
@@ -24,6 +29,13 @@ MAKEDIR = || exec false; \
          mkdir "$$dir" || \
          exec false; fi || exec false
 
+BINARY_PREREQS = bin/.dummy
+
+bin/.dummy:
+       @if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
+         dir=bin $(MAKEDIR); fi
+       @: >> $@ || : > $@ # what a fancy emoticon!
+
 .c.o:
        @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
         dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
@@ -38,30 +50,23 @@ NETDOMJOIN_OBJ = netdomjoin/netdomjoin.o
 NETDOMJOIN_GUI_OBJ = netdomjoin-gui/netdomjoin-gui.o
 GETJOINABLEOUS_OBJ = getjoinableous/getjoinableous.o
 
-PROGS = bin/[EMAIL PROTECTED]@ \
-       bin/[EMAIL PROTECTED]@ \
-       bin/[EMAIL PROTECTED]@ \
-       bin/[EMAIL PROTECTED]@
-
-all: $(PROGS)
-
-bin/[EMAIL PROTECTED]@: $(GETDC_OBJ)
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(GETDC_OBJ)
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(GETDC_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
 
-bin/[EMAIL PROTECTED]@: $(GETJOINABLEOUS_OBJ)
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(GETJOINABLEOUS_OBJ)
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(GETJOINABLEOUS_OBJ) $(LDFLAGS) $(DYNEXP) 
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
 
-bin/[EMAIL PROTECTED]@: $(NETDOMJOIN_OBJ)
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NETDOMJOIN_OBJ)
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(NETDOMJOIN_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
 
-bin/[EMAIL PROTECTED]@: $(NETDOMJOIN_GUI_OBJ)
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NETDOMJOIN_GUI_OBJ)
        @echo Linking $@
        @$(CC) $(FLAGS) $(GTK_FLAGS) -o $@ $(NETDOMJOIN_GUI_OBJ) $(LDFLAGS) 
$(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(GTK_LIBS)
 
 clean:
        -rm -f $(PROGS)
        -rm -f core */*~ *~ \
-               */*.o */*/*.o */*/*/*.o \
+               */*.o */*/*.o */*/*/*.o


-- 
Samba Shared Repository