Move libnetapi examples into subdirs.

Guenther
(This used to be commit 0c3de6f3458419e57daaa71f1dad679897388f5a)

diff --git a/source3/lib/netapi/examples/Makefile.in b/source3/lib/netapi/examples/Makefile.in
index 119e722aec501b6a0d698e77f83cdd5286acb261..c2f453dedc03dd78abea3a139363063f515b5f30 100644 (file)
--- a/source3/lib/netapi/examples/Makefile.in
+++ b/source3/lib/netapi/examples/Makefile.in
@@ -14,6 +14,16 @@ DYNEXP=@DYNEXP@
 COMPILE_CC = $(CC) -I. $(FLAGS) $(PICFLAG) -c $< -o $@
 COMPILE = $(COMPILE_CC)
 
+BINARY_PREREQS = proto_exists bin/.dummy
+
+MAKEDIR = || exec false; \
+         if test -d "$$dir"; then :; else \
+         echo mkdir "$$dir"; \
+         mkdir -p "$$dir" >/dev/null 2>&1 || \
+         test -d "$$dir" || \
+         mkdir "$$dir" || \
+         exec false; fi || exec false
+
 .c.o:
        @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
         dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
@@ -23,23 +33,23 @@ COMPILE = $(COMPILE_CC)
                echo "$(COMPILE_CC)" 1>&2;\
                $(COMPILE_CC) >/dev/null 2>&1
 
-GETDC_OBJ = getdc.o
-NETDOMJOIN_OBJ = netdomjoin.o
-NETDOMJOIN_GUI_OBJ = netdomjoin-gui.o
+GETDC_OBJ = getdc/getdc.o
+NETDOMJOIN_OBJ = netdomjoin/netdomjoin.o
+NETDOMJOIN_GUI_OBJ = netdomjoin-gui/netdomjoin-gui.o
 
-PROGS = getdc netdomjoin netdomjoin-gui
+PROGS = bin/getdc@EXEEXT@ bin/netdomjoin@EXEEXT@ bin/netdomjoin-gui@EXEEXT@
 
 all: $(PROGS)
 
-getdc: $(GETDC_OBJ)
+bin/getdc@EXEEXT@: $(GETDC_OBJ)
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(GETDC_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
 
-netdomjoin: $(NETDOMJOIN_OBJ)
+bin/netdomjoin@EXEEXT@: $(NETDOMJOIN_OBJ)
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(NETDOMJOIN_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
 
-netdomjoin-gui: $(NETDOMJOIN_GUI_OBJ)
+bin/netdomjoin-gui@EXEEXT@: $(NETDOMJOIN_GUI_OBJ)
        @echo Linking $@
        @$(CC) $(FLAGS) $(GTK_FLAGS) -o $@ $(NETDOMJOIN_GUI_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(GTK_LIBS)
 

diff --git a/source3/lib/netapi/examples/getdc.c b/source3/lib/netapi/examples/getdc/getdc.c
similarity index 100%
rename from source3/lib/netapi/examples/getdc.c
rename to source3/lib/netapi/examples/getdc/getdc.c

diff --git a/source3/lib/netapi/examples/logo.png b/source3/lib/netapi/examples/netdomjoin-gui/logo.png
similarity index 100%
rename from source3/lib/netapi/examples/logo.png
rename to source3/lib/netapi/examples/netdomjoin-gui/logo.png

diff --git a/source3/lib/netapi/examples/samba.ico b/source3/lib/netapi/examples/netdomjoin-gui/samba.ico
similarity index 100%
rename from source3/lib/netapi/examples/samba.ico
rename to source3/lib/netapi/examples/netdomjoin-gui/samba.ico

diff --git a/source3/lib/netapi/examples/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin/netdomjoin-gui.c
similarity index 100%
rename from source3/lib/netapi/examples/netdomjoin-gui.c
rename to source3/lib/netapi/examples/netdomjoin/netdomjoin-gui.c

diff --git a/source3/lib/netapi/examples/netdomjoin.c b/source3/lib/netapi/examples/netdomjoin/netdomjoin.c
similarity index 100%
rename from source3/lib/netapi/examples/netdomjoin.c
rename to source3/lib/netapi/examples/netdomjoin/netdomjoin.c