diff options
| author | Günther Deschner <gd@samba.org> | 2007-12-21 17:05:55 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2007-12-21 17:05:55 +0100 |
| commit | 77a2e13cb1950cfd591f31b6a12eae66c342e632 (patch) | |
| tree | 4e464fb5c5394e0f123afc2641aaed7d6c0066c8 | |
| parent | 73634050607d44279f04e14c1e161a6a304c5e47 (diff) | |
| download | samba-77a2e13cb1950cfd591f31b6a12eae66c342e632.tar.gz samba-77a2e13cb1950cfd591f31b6a12eae66c342e632.tar.bz2 samba-77a2e13cb1950cfd591f31b6a12eae66c342e632.zip | |
Move libnetapi examples into subdirs.
Guenther
(This used to be commit 0c3de6f3458419e57daaa71f1dad679897388f5a)
| -rw-r--r-- | source3/lib/netapi/examples/Makefile.in | 24 | ||||
| -rw-r--r-- | source3/lib/netapi/examples/getdc/getdc.c (renamed from source3/lib/netapi/examples/getdc.c) | 0 | ||||
| -rw-r--r-- | source3/lib/netapi/examples/netdomjoin-gui/logo.png (renamed from source3/lib/netapi/examples/logo.png) | bin | 9329 -> 9329 bytes | |||
| -rwxr-xr-x | source3/lib/netapi/examples/netdomjoin-gui/samba.ico (renamed from source3/lib/netapi/examples/samba.ico) | bin | 1406 -> 1406 bytes | |||
| -rw-r--r-- | source3/lib/netapi/examples/netdomjoin/netdomjoin-gui.c (renamed from source3/lib/netapi/examples/netdomjoin-gui.c) | 0 | ||||
| -rw-r--r-- | source3/lib/netapi/examples/netdomjoin/netdomjoin.c (renamed from source3/lib/netapi/examples/netdomjoin.c) | 0 |
6 files changed, 17 insertions, 7 deletions
diff --git a/source3/lib/netapi/examples/Makefile.in b/source3/lib/netapi/examples/Makefile.in index 119e722aec..c2f453dedc 100644 --- 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 index ed6a8bd05d..ed6a8bd05d 100644 --- a/source3/lib/netapi/examples/getdc.c +++ b/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 Binary files differindex 6df4ace659..6df4ace659 100644 --- a/source3/lib/netapi/examples/logo.png +++ b/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 Binary files differindex b70c9590de..b70c9590de 100755 --- a/source3/lib/netapi/examples/samba.ico +++ b/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 index 8ca6897cab..8ca6897cab 100644 --- a/source3/lib/netapi/examples/netdomjoin-gui.c +++ b/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 index a2bb700250..a2bb700250 100644 --- a/source3/lib/netapi/examples/netdomjoin.c +++ b/source3/lib/netapi/examples/netdomjoin/netdomjoin.c |
