Fix build system from code reorg

This commit is contained in:
Neel Goyal 2013-08-15 10:54:30 -04:00
parent dba0da5adb
commit ddf9d3d548
7 changed files with 13 additions and 13 deletions

10
configure vendored
View File

@ -595,7 +595,7 @@ PACKAGE_STRING='getdns 0.320'
PACKAGE_BUGREPORT='melinda.shore@nomountain.net'
PACKAGE_URL=''
ac_unique_file="src/common/getdns_general.c"
ac_unique_file="src/getdns/getdns.h"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@ -767,7 +767,7 @@ LDFLAGS
LIBS
CPPFLAGS
CPP'
ac_subdirs_all='src/ src/common/ src/example/ src/test/'
ac_subdirs_all='src/ src/getdns/ src/example/ src/test/'
# Initialize some variables set by options.
ac_init_help=
@ -12336,11 +12336,11 @@ _ACEOF
esac
ac_config_files="$ac_config_files Makefile src/Makefile src/common/Makefile src/example/Makefile src/test/Makefile"
ac_config_files="$ac_config_files Makefile src/Makefile src/getdns/Makefile src/example/Makefile src/test/Makefile"
subdirs="$subdirs src/ src/common/ src/example/ src/test/"
subdirs="$subdirs src/ src/getdns/ src/example/ src/test/"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -13368,7 +13368,7 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/Makefile" ;;
"src/getdns/Makefile") CONFIG_FILES="$CONFIG_FILES src/getdns/Makefile" ;;
"src/example/Makefile") CONFIG_FILES="$CONFIG_FILES src/example/Makefile" ;;
"src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;;

View File

@ -1,4 +1,4 @@
SUBDIRS = example test
SUBDIRS = . getdns example test
AM_CPPFLAGS = -Wall -Werror -g -fPIC -I$(srcdir)/ -I /usr/local/include -std=c99
lib_LTLIBRARIES = libgetdns.la
libgetdns_la_SOURCES = context.c convert.c \

View File

@ -29,7 +29,7 @@
*/
#include <string.h>
#include "getdns_context.h"
#include "context.h"
#include <ldns/ldns.h>
/* stuff to make it compile pedantically */

View File

@ -1,5 +1,5 @@
AM_CPPFLAGS = -Wall -Werror -g -fPIC -I$(srcdir)/ -I/usr/local/include -I../common -std=c99
AM_LDFLAGS = -L../common -L/usr/local/lib -lgetdns -lldns -levent
AM_CPPFLAGS = -Wall -Werror -g -fPIC -I$(srcdir)/ -I/usr/local/include -I$(top_srcdir)/src -std=c99
AM_LDFLAGS =-L$(top_srcdir)/src -L/usr/local/lib -lgetdns -lldns -levent
bin_PROGRAMS = example_all_functions example_synchronous \
example_simple_answers example_tree
example_all_functions_SOURCES = example_all_functions.c

View File

@ -58,7 +58,7 @@
* Version: 0.1b
*/
#include "getdns_context.h"
#include "context.h"
#include <ldns/ldns.h>
/* useful macros */

View File

@ -1 +1 @@
include_HEADERS = getdns.h
pkginclude_HEADERS = getdns.h

View File

@ -1,5 +1,5 @@
AM_CPPFLAGS = -Wall -Werror -g -fPIC -I$(srcdir)/ -I/usr/local/include -I../common -std=c99
AM_LDFLAGS = -L../common -L/usr/local/lib -lgetdns
AM_CPPFLAGS = -Wall -Werror -g -fPIC -I$(srcdir)/ -I/usr/local/include -I$(top_srcdir)/src -std=c99
AM_LDFLAGS =-L$(top_srcdir)/src -L/usr/local/lib -lgetdns
bin_PROGRAMS = tests_list tests_dict
tests_list_SOURCES = tests_list.c testmessages.c
tests_dict_SOURCES = tests_dict.c testmessages.c