moved tools to examples/ dir, added install target for examples

diff --git a/Makefile.in b/Makefile.in
index 2233d1d9a99992d34f6857e541f243a26b6b885c..cdd7e7bfdd23ccaeba230f7acc4a050a59272ff1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,10 +56,6 @@ LIBDNS_HEADERS       =       $(srcdir)/ldns/error.h          \
                        ldns/util.h             \
                        $(srcdir)/ldns/update.h                 \
                        $(srcdir)/ldns/tsig.h
-PROG_SOURCES   =       ldns-keygen.c ldns-key2ds.c ldns-signzone.c \
-                       ldns-version.c
-PROG_TARGETS   =       $(PROG_SOURCES:.c=)
-
 LIBDNS_OBJECTS =       $(LIBDNS_SOURCES:.c=.o)
 LIBDNS_LOBJECTS        =       $(LIBDNS_SOURCES:.c=.lo)
 
@@ -119,6 +115,9 @@ examples-clean:     ./drill/Makefile
 examples-confclean:    ./drill/Makefile
                ( cd examples ; $(MAKE) -f Makefile confclean)
 
+examples-install:
+               ( cd examples ; $(MAKE) -f Makefile install)
+
 ./tests/Makefile:
                ( $(INSTALL) -d tests ; cd tests ; ../$(srcdir)/tests/configure --prefix=$(prefix) LDFLAGS="-L../.libs" CPPFLAGS="-I.. -I../..")
 
@@ -216,27 +215,6 @@ release:   distclean
                (cd .. ; tar --verbose  --exclude ".svn" --exclude "*.key" --exclude "*.private" --create --exclude "lua" --exclude "tests" --file ldns-$(VERSION).tar.gz --gzip ldns-$(VERSION)/)
                (rm -rf ../ldns-$(VERSION)/)
 
-ldns-mx:       ldns-mx.o $(LIBDNS_OBJECTS) $(LIBOBJS)
-               $(LINK) ${LIBS} -o $@ $+
-
-ldns-version:  ldns-version.o $(LIBDNS_OBJECTS) $(LIBOBJS)
-               $(LINK) ${LIBS} -o $@ $+
-
-ldns-signzone: ldns-signzone.o $(LIBDNS_OBJECTS) $(LIBOBJS)
-               $(LINK) ${LIBS} -o $@ $+
-
-ldns-chaos:    ldns-chaos.o $(LIBDNS_OBJECTS) $(LIBOBJS)
-               $(LINK) ${LIBS} -o $@ $+
-
-ldns-keygen:   ldns-keygen.o $(LIBDNS_OBJECTS) $(LIBOBJS)
-               $(LINK) ${LIBS} -o $@ $+
-
-ldns-key2ds:   ldns-key2ds.o $(LIBDNS_OBJECTS) $(LIBOBJS)
-               $(LINK) ${LIBS} -o $@ $+
-
-ldns-update:   ldns-update.o $(LIBDNS_OBJECTS) $(LIBOBJS)
-               $(LINK) ${LIBS} -o $@ $+
-
 clean: 
        rm -f *.o *.d 
        rm -f *~

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 250cde028e1905b8bc1d70d0b3fddd60d683a886..d460867df22c92ac14842f4cea4f857f4ff07b80 100644 (file)
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -15,6 +15,8 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 
+INSTALL = $(srcdir)/../install-sh 
+
 COMPILE         = $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK            = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS)
 
@@ -22,7 +24,11 @@ HEADER               = config.h
 TESTS          = ldns-read-zone \
                  ldns-mx \
                  ldns-chaos \
-                 ldns-update
+                 ldns-update \
+                 ldns-keygen \
+                 ldns-key2ds \
+                 ldns-signzone \
+                 ldns-version
 
 .PHONY:        all clean realclean
 
@@ -40,6 +46,18 @@ ldns-chaos:  ldns-chaos.o
 ldns-update:   ldns-update.o
                $(LINK) -o $@ $+
 
+ldns-version:  ldns-version.o
+               $(LINK) -o $@ $+
+
+ldns-signzone: ldns-signzone.o
+               $(LINK) -o $@ $+
+
+ldns-keygen:   ldns-keygen.o
+               $(LINK) -o $@ $+
+
+ldns-key2ds:   ldns-key2ds.o
+               $(LINK) -o $@ $+
+
 ## implicit rule
 %.o:
        $(COMPILE) -c $(srcdir)/$*.c
@@ -56,3 +74,18 @@ realclean: clean
 confclean: clean
        rm -rf config.log config.status config.h Makefile
 
+install:       $(TESTS)
+               $(INSTALL) -d -m 755 ${prefix}/bin
+               for i in $(TESTS); do \
+                       ${INSTALL} -c $$i ${prefix}/bin/ ; done
+               exit 0
+
+
+uninstall:
+               for i in $(TESTS); do \
+                       rm -f $(bindir)/$$i ; done
+               exit 0
+               rmdir --ignore-fail-on-non-empty -p $(prefix)/bin
+
+               
+

diff --git a/ldns-key2ds.c b/examples/ldns-key2ds.c
similarity index 100%
rename from ldns-key2ds.c
rename to examples/ldns-key2ds.c

diff --git a/ldns-keygen.c b/examples/ldns-keygen.c
similarity index 99%
rename from ldns-keygen.c
rename to examples/ldns-keygen.c
index 575fd0b5b599ca58068098a9abd244700afd2148..935876d18050901305a0a87023168b0522be6aef 100644 (file)
--- a/ldns-keygen.c
+++ b/examples/ldns-keygen.c
@@ -5,7 +5,7 @@
  * Licensed under the GPL version 2
  */
 
-#include <ldns/config.h>
+#include "config.h"
 
 #include <ldns/dns.h>
 

diff --git a/ldns-signzone.c b/examples/ldns-signzone.c
similarity index 100%
rename from ldns-signzone.c
rename to examples/ldns-signzone.c

diff --git a/ldns-version.c b/examples/ldns-version.c
similarity index 100%
rename from ldns-version.c
rename to examples/ldns-version.c