interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move examples to spec dir

This commit is contained in:
Willem Toorop 2014-10-24 14:39:58 +02:00
parent 87c54886c8
commit b063462786
12 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.in
View File

@ -90,7 +90,7 @@ doc: FORCE
cd doc && $(MAKE) $@ cd doc && $(MAKE) $@
example: example:
cd src && $(MAKE) $@ cd spec/example && $(MAKE) $@
test: test:
cd src && $(MAKE) $@ cd src && $(MAKE) $@
@ -98,6 +98,7 @@ test:
clean: clean:
cd src && $(MAKE) $@ cd src && $(MAKE) $@
cd doc && $(MAKE) $@ cd doc && $(MAKE) $@
cd spec/example && $(MAKE) $@
rm -f *.o rm -f *.o
depend: depend:
@ -108,6 +109,7 @@ distclean:
rmdir src 2>/dev/null || true rmdir src 2>/dev/null || true
cd doc && $(MAKE) $@ cd doc && $(MAKE) $@
rmdir doc 2>/dev/null || true rmdir doc 2>/dev/null || true
cd spec/example && $(MAKE) $@
rm -f config.log config.status Makefile libtool rm -f config.log config.status Makefile libtool
rm -fR autom4te.cache rm -fR autom4te.cache
@ -130,10 +132,10 @@ $(distdir):
mkdir -p $(distdir)/src mkdir -p $(distdir)/src
mkdir -p $(distdir)/src/getdns mkdir -p $(distdir)/src/getdns
mkdir -p $(distdir)/src/test mkdir -p $(distdir)/src/test
mkdir -p $(distdir)/src/example
mkdir -p $(distdir)/src/extension mkdir -p $(distdir)/src/extension
mkdir -p $(distdir)/doc mkdir -p $(distdir)/doc
mkdir -p $(distdir)/spec mkdir -p $(distdir)/spec
mkdir -p $(distdir)/spec/example
cp $(srcdir)/configure.ac $(distdir) cp $(srcdir)/configure.ac $(distdir)
cp $(srcdir)/configure $(distdir) cp $(srcdir)/configure $(distdir)
cp $(srcdir)/AUTHORS $(distdir) cp $(srcdir)/AUTHORS $(distdir)
@ -160,12 +162,14 @@ $(distdir):
cp $(srcdir)/src/test/*.[ch] $(distdir)/src/test cp $(srcdir)/src/test/*.[ch] $(distdir)/src/test
cp $(srcdir)/src/test/*.sh $(distdir)/src/test cp $(srcdir)/src/test/*.sh $(distdir)/src/test
cp $(srcdir)/src/test/*.good $(distdir)/src/test cp $(srcdir)/src/test/*.good $(distdir)/src/test
cp $(srcdir)/src/example/Makefile.in $(distdir)/src/example
cp $(srcdir)/src/example/*.[ch] $(distdir)/src/example
cp $(srcdir)/doc/Makefile.in $(distdir)/doc cp $(srcdir)/doc/Makefile.in $(distdir)/doc
cp $(srcdir)/doc/*.in $(distdir)/doc cp $(srcdir)/doc/*.in $(distdir)/doc
cp $(srcdir)/doc/manpgaltnames $(distdir)/doc cp $(srcdir)/doc/manpgaltnames $(distdir)/doc
cp $(srcdir)/spec/* $(distdir)/spec cp $(srcdir)/spec/*.html $(distdir)/spec
cp $(srcdir)/spec/*.tgz $(distdir)/spec
cp $(srcdir)/spec/example/Makefile.in $(distdir)/spec/example
cp $(srcdir)/spec/example/*.[ch] $(distdir)/spec/example
distcheck: $(distdir).tar.gz distcheck: $(distdir).tar.gz
gzip -cd $(distdir).tar.gz | tar xvf - gzip -cd $(distdir).tar.gz | tar xvf -

4
configure vendored
View File

@ -11683,7 +11683,7 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: Default trust anchor: $TRUST_ANCHOR_FILE" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Default trust anchor: $TRUST_ANCHOR_FILE" >&5
$as_echo "$as_me: Default trust anchor: $TRUST_ANCHOR_FILE" >&6;} $as_echo "$as_me: Default trust anchor: $TRUST_ANCHOR_FILE" >&6;}
ac_config_files="$ac_config_files Makefile src/Makefile src/getdns/Makefile src/getdns/getdns.h src/example/Makefile src/test/Makefile doc/Makefile" ac_config_files="$ac_config_files Makefile src/Makefile src/getdns/Makefile src/getdns/getdns.h spec/example/Makefile src/test/Makefile doc/Makefile"
if test -n "$DOXYGEN" if test -n "$DOXYGEN"
then ac_config_files="$ac_config_files src/Doxyfile" then ac_config_files="$ac_config_files src/Doxyfile"
@ -12826,7 +12826,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/getdns/Makefile") CONFIG_FILES="$CONFIG_FILES src/getdns/Makefile" ;; "src/getdns/Makefile") CONFIG_FILES="$CONFIG_FILES src/getdns/Makefile" ;;
"src/getdns/getdns.h") CONFIG_FILES="$CONFIG_FILES src/getdns/getdns.h" ;; "src/getdns/getdns.h") CONFIG_FILES="$CONFIG_FILES src/getdns/getdns.h" ;;
"src/example/Makefile") CONFIG_FILES="$CONFIG_FILES src/example/Makefile" ;; "spec/example/Makefile") CONFIG_FILES="$CONFIG_FILES spec/example/Makefile" ;;
"src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;; "src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"src/Doxyfile") CONFIG_FILES="$CONFIG_FILES src/Doxyfile" ;; "src/Doxyfile") CONFIG_FILES="$CONFIG_FILES src/Doxyfile" ;;

2
configure.ac
View File

@ -384,7 +384,7 @@ AC_DEFINE_UNQUOTED([TRUST_ANCHOR_FILE], ["$TRUST_ANCHOR_FILE"], [Default trust a
AC_SUBST(TRUST_ANCHOR_FILE) AC_SUBST(TRUST_ANCHOR_FILE)
AC_MSG_NOTICE([Default trust anchor: $TRUST_ANCHOR_FILE]) AC_MSG_NOTICE([Default trust anchor: $TRUST_ANCHOR_FILE])
AC_CONFIG_FILES([Makefile src/Makefile src/getdns/Makefile src/getdns/getdns.h src/example/Makefile src/test/Makefile doc/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile src/getdns/Makefile src/getdns/getdns.h spec/example/Makefile src/test/Makefile doc/Makefile])
if [ test -n "$DOXYGEN" ] if [ test -n "$DOXYGEN" ]
then AC_CONFIG_FILES([src/Doxyfile]) then AC_CONFIG_FILES([src/Doxyfile])
fi fi

4
src/example/Makefile.in → spec/example/Makefile.in
View File

@ -45,8 +45,8 @@ EXTENSION_LIBEVENT_EXT_LIBS=@EXTENSION_LIBEVENT_EXT_LIBS@
EXTENSION_LIBEVENT_LDFLAGS=@EXTENSION_LIBEVENT_LDFLAGS@ EXTENSION_LIBEVENT_LDFLAGS=@EXTENSION_LIBEVENT_LDFLAGS@
CC=@CC@ CC=@CC@
CFLAGS=@CFLAGS@ -Wall -I.. -I$(srcdir)/.. -I$(srcdir) -std=c99 CFLAGS=@CFLAGS@ -Wall -I$(srcdir) -I$(srcdir)/../../src -std=c99
LDFLAGS=@LDFLAGS@ -L.. LDFLAGS=@LDFLAGS@ -L../../src
LDLIBS=-lgetdns @LIBS@ LDLIBS=-lgetdns @LIBS@
PROGRAMS=example-all-functions example-simple-answers example-tree example-synchronous example-reverse PROGRAMS=example-all-functions example-simple-answers example-tree example-synchronous example-reverse

0
src/example/example-all-functions.c → spec/example/example-all-functions.c
View File

0
src/example/example-reverse.c → spec/example/example-reverse.c
View File

0
src/example/example-simple-answers.c → spec/example/example-simple-answers.c
View File

0
src/example/example-synchronous.c → spec/example/example-synchronous.c
View File

0
src/example/example-tree.c → spec/example/example-tree.c
View File

0
src/example/getdns_core_only.h → spec/example/getdns_core_only.h
View File

0
src/example/getdns_libevent.h → spec/example/getdns_libevent.h
View File

10
src/Makefile.in
View File

@ -56,10 +56,10 @@ have_libev = @have_libev@
# datarootdir is here to please some checkers # datarootdir is here to please some checkers
datarootdir=@datarootdir@ datarootdir=@datarootdir@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
LIBTOOL = ../libtool
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
LIBTOOL = ../libtool
CC=@CC@ CC=@CC@
CFLAGS=@CFLAGS@ -Wall -I$(srcdir) -I. -std=c99 -D_POSIX_C_SOURCE=200112L CFLAGS=@CFLAGS@ -Wall -I$(srcdir) -I. -std=c99 -D_POSIX_C_SOURCE=200112L
@ -142,20 +142,14 @@ libgetdns.la: $(GETDNS_OBJ) $(GLDNS_OBJ) $(COMPAT_OBJ) $(UTIL_OBJ)
test: FORCE test: FORCE
cd test && $(MAKE) $@ cd test && $(MAKE) $@
example: FORCE
cd example && $(MAKE) $@
clean: clean:
cd test && $(MAKE) $@ cd test && $(MAKE) $@
cd example && $(MAKE) $@
rm -f *.o *.lo extension/*.lo extension/*.o $(PROGRAMS) libgetdns.la libgetdns_ext_*.la rm -f *.o *.lo extension/*.lo extension/*.o $(PROGRAMS) libgetdns.la libgetdns_ext_*.la
rm -rf .libs extension/.libs rm -rf .libs extension/.libs
distclean : clean distclean : clean
cd test && $(MAKE) $@ cd test && $(MAKE) $@
rmdir test 2>/dev/null || true rmdir test 2>/dev/null || true
cd example && $(MAKE) $@
rmdir example 2>/dev/null || true
rm -f Makefile config.status config.log Doxyfile config.h getdns/Makefile getdns/getdns.h rm -f Makefile config.status config.log Doxyfile config.h getdns/Makefile getdns/getdns.h
rmdir getdns 2>/dev/null || true rmdir getdns 2>/dev/null || true
rmdir extension 2>/dev/null || true rmdir extension 2>/dev/null || true
@ -204,7 +198,7 @@ depend:
(cd $(srcdir) ; diff Makefile.in.new Makefile.in && rm Makefile.in.new \ (cd $(srcdir) ; diff Makefile.in.new Makefile.in && rm Makefile.in.new \
|| mv Makefile.in.new Makefile.in ) || mv Makefile.in.new Makefile.in )
.PHONY: clean test example .PHONY: clean test
FORCE: FORCE:
# Dependencies for gldns, utils, the mini_event extension and compat functions # Dependencies for gldns, utils, the mini_event extension and compat functions