Tweak include paths so we're buildable outside of source tree.

This commit is contained in:
Brian Cox 2016-06-20 19:49:21 -07:00
parent a2f9fa4e06
commit 78fdac5efc
26 changed files with 26 additions and 26 deletions

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libcore.a noinst_LIBRARIES = libcore.a
libcore_adir=. libcore_adir=.

View File

@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libcore.a noinst_LIBRARIES = libcore.a
libcore_adir = . libcore_adir = .
libcore_a_SOURCES = \ libcore_a_SOURCES = \

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libdb.a noinst_LIBRARIES = libdb.a
libdb_adir=. libdb_adir=.

View File

@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libdb.a noinst_LIBRARIES = libdb.a
libdb_adir = . libdb_adir = .
libdb_a_SOURCES = \ libdb_a_SOURCES = \

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libfco.a noinst_LIBRARIES = libfco.a
libfco_adir=. libfco_adir=.

View File

@ -321,7 +321,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libfco.a noinst_LIBRARIES = libfco.a
libfco_adir = . libfco_adir = .
libfco_a_SOURCES = \ libfco_a_SOURCES = \

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libfs.a noinst_LIBRARIES = libfs.a
libfs_adir=. libfs_adir=.

View File

@ -316,7 +316,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libfs.a noinst_LIBRARIES = libfs.a
libfs_adir = . libfs_adir = .
libfs_a_SOURCES = \ libfs_a_SOURCES = \

View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
LIBS = -ltripwire -lcryptlib @LIBS@ LIBS = -ltripwire -lcryptlib @LIBS@
LDFLAGS = @LDFLAGS@ -L../../lib LDFLAGS = @LDFLAGS@ -L../../lib
LN_S = @LN@ LN_S = @LN@

View File

@ -309,7 +309,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
siggendir = . siggendir = .
siggen_SOURCES = \ siggen_SOURCES = \
siggen.cpp siggencmdline.cpp siggenmain.cpp \ siggen.cpp siggencmdline.cpp siggenmain.cpp \

View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
LIBS = -ltripwire -lcryptlib @LIBS@ LIBS = -ltripwire -lcryptlib @LIBS@
LDFLAGS = @LDFLAGS@ -L../../lib LDFLAGS = @LDFLAGS@ -L../../lib
LN_S = @LN@ LN_S = @LN@

View File

@ -313,7 +313,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
tripwiredir = . tripwiredir = .
tripwire_SOURCES = \ tripwire_SOURCES = \
generatedb.cpp integritycheck.cpp mailmessage.cpp pipedmailmessage.cpp \ generatedb.cpp integritycheck.cpp mailmessage.cpp pipedmailmessage.cpp \

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libtw.a noinst_LIBRARIES = libtw.a
libtw_adir=. libtw_adir=.

View File

@ -319,7 +319,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libtw.a noinst_LIBRARIES = libtw.a
libtw_adir = . libtw_adir = .
libtw_a_SOURCES = \ libtw_a_SOURCES = \

View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
LIBS = -ltripwire -lcryptlib @LIBS@ LIBS = -ltripwire -lcryptlib @LIBS@
LDFLAGS = @LDFLAGS@ -L../../lib LDFLAGS = @LDFLAGS@ -L../../lib
LN_S = @LN@ LN_S = @LN@

View File

@ -309,7 +309,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
twadmindir = . twadmindir = .
twadmin_SOURCES = \ twadmin_SOURCES = \
keygeneration.cpp stdtwadmin.cpp twadmin.cpp twadmincl.cpp \ keygeneration.cpp stdtwadmin.cpp twadmin.cpp twadmincl.cpp \

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libtwcrypto.a noinst_LIBRARIES = libtwcrypto.a
libtwcrypto_adir=. libtwcrypto_adir=.

View File

@ -314,7 +314,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libtwcrypto.a noinst_LIBRARIES = libtwcrypto.a
libtwcrypto_adir = . libtwcrypto_adir = .
libtwcrypto_a_SOURCES = \ libtwcrypto_a_SOURCES = \

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libtwparser.a noinst_LIBRARIES = libtwparser.a
libtwparser_adir=. libtwparser_adir=.

View File

@ -315,7 +315,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libtwparser.a noinst_LIBRARIES = libtwparser.a
libtwparser_adir = . libtwparser_adir = .
libtwparser_a_SOURCES = \ libtwparser_a_SOURCES = \

View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
LIBS = -ltripwire -lcryptlib @LIBS@ LIBS = -ltripwire -lcryptlib @LIBS@
LDFLAGS = @LDFLAGS@ -L../../lib LDFLAGS = @LDFLAGS@ -L../../lib
LN_S = @LN@ LN_S = @LN@

View File

@ -309,7 +309,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
twprintdir = . twprintdir = .
twprint_SOURCES = \ twprint_SOURCES = \
stdtwprint.cpp twprint.cpp twprintcmdline.cpp twprinterrors.cpp \ stdtwprint.cpp twprint.cpp twprintcmdline.cpp twprinterrors.cpp \

View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
LIBS = -ltripwire -lcryptlib @LIBS@ LIBS = -ltripwire -lcryptlib @LIBS@
LDFLAGS = @LDFLAGS@ -L../../lib LDFLAGS = @LDFLAGS@ -L../../lib
LN_S = @LN@ LN_S = @LN@

View File

@ -349,7 +349,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_INSTALL_PROGRAM_FLAGS = -m 755 AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
twtestdir = . twtestdir = .
twtest_SOURCES = \ twtest_SOURCES = \
archive_t.cpp \ archive_t.cpp \

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libutil.a noinst_LIBRARIES = libutil.a
libutil_adir = . libutil_adir = .

View File

@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I$(srcdir)/..
noinst_LIBRARIES = libutil.a noinst_LIBRARIES = libutil.a
libutil_adir = . libutil_adir = .
libutil_a_SOURCES = \ libutil_a_SOURCES = \