diff options
-rw-r--r-- | INSTALL | 8 | ||||
-rw-r--r-- | applications/rasql/Makefile.am | 6 | ||||
-rw-r--r-- | catalogmgr/Makefile.am | 8 | ||||
-rw-r--r-- | clientcomm/Makefile.am | 7 | ||||
-rw-r--r-- | compression/Makefile.am | 6 | ||||
-rw-r--r-- | configure.ac | 66 | ||||
-rw-r--r-- | httpserver/Makefile.am | 1 | ||||
-rw-r--r-- | insertutils/Makefile.am | 7 | ||||
-rw-r--r-- | mddmgr/Makefile.am | 4 | ||||
-rw-r--r-- | qlparser/Makefile.am | 4 | ||||
-rw-r--r-- | rasdl/Makefile.am | 6 | ||||
-rw-r--r-- | raslib/Makefile.am | 4 | ||||
-rw-r--r-- | rasodmg/Makefile.am | 6 | ||||
-rw-r--r-- | reladminif/Makefile.am | 5 | ||||
-rw-r--r-- | relblobif/Makefile.am | 6 | ||||
-rw-r--r-- | relcatalogif/Makefile.am | 6 | ||||
-rw-r--r-- | relindexif/Makefile.am | 6 | ||||
-rw-r--r-- | relmddif/Makefile.am | 6 | ||||
-rw-r--r-- | relstorageif/Makefile.am | 6 | ||||
-rw-r--r-- | server/Makefile.am | 7 | ||||
-rw-r--r-- | servercomm/Makefile.am | 8 |
21 files changed, 107 insertions, 76 deletions
@@ -24,6 +24,14 @@ It can be found in manuals_and_examples/manuals/pdf/inst-guide.pdf Tips and tricks: ~~~~~~~~~~~~~~~~ + * If some libraries are installed in special places, you can set + CPPFLAGS or LDFLAGS when running configure, i.e. e.g. + + $ export CPPFLAGS="-I/usr/include/netpbm" LDFLAGS="-L/usr/lib/hdf" + $ ./configure --prefix=$PWD/_i --with-hdf4 + + to build on a Fedora 14 system. + * If you are building from a git clone and want to clean ALL files like you had just done a fresh "git clone", run diff --git a/applications/rasql/Makefile.am b/applications/rasql/Makefile.am index 521af32..ddd7ea0 100644 --- a/applications/rasql/Makefile.am +++ b/applications/rasql/Makefile.am @@ -28,16 +28,16 @@ # ################################################################## -AM_CXXFLAGS=@CLIENTCXXFLAGS@ -AM_LDFLAGS=@CLIENTLDFLAGS@ - bin_PROGRAMS=rasql rasql_SOURCES= rasql.cc rasql_error.cc rasql_error.hh \ rasql_signal.cc rasql_signal.hh +rasql_CPPFLAGS = $(AM_CPPFLAGS) +rasql_CPPFLAGS += $(CLIENT_CPPFLAGS) rasql_LDADD = ../../rasodmg/librasodmg.a ../../clientcomm/libclientcomm.a \ ../../compression/libcompression.a ../../raslib/libraslib.a \ ../../conversion/libconversion.a ../../commline/libcommline.a \ ../../network/libnetwork.a +rasql_LDADD += $(CLIENT_LIBS) SUBDIRS= ../../rasodmg ../../clientcomm ../../compression \ ../../raslib ../../conversion ../../commline ../../network diff --git a/catalogmgr/Makefile.am b/catalogmgr/Makefile.am index 3f5669f..a38dea4 100644 --- a/catalogmgr/Makefile.am +++ b/catalogmgr/Makefile.am @@ -28,12 +28,12 @@ ################################################################## -AM_CXXFLAGS= $(BASEDBCXXFLAGS) -AM_LDFLAGS= $(BASEDBLDFLAGS) - # object files to put in library pkglib_LIBRARIES=libcatalogmgr.a libcatalogmgr_a_SOURCES=ops.cc typefactory.cc algebraops.cc ops.hh \ typefactory.hh algebraops.hh autogen_ops.hh -EXTRA_libcatalogmgr_a_SOURCES = autogen_ops.cc +libcatalogmgr_a_CPPFLAGS = $(AM_CPPFLAGS) +libcatalogmgr_a_CPPFLAGS += $(BASEDB_CPPFLAGS) + +EXTRA_libcatalogmgr_a_SOURCES = autogen_ops.cc diff --git a/clientcomm/Makefile.am b/clientcomm/Makefile.am index 6c2f3a9..e7aa7f0 100644 --- a/clientcomm/Makefile.am +++ b/clientcomm/Makefile.am @@ -29,9 +29,6 @@ # ################################################################## -AM_CXXFLAGS = @CLIENTCXXFLAGS@ -AM_LDFLAGS = @CLIENTLDFLAGS@ - pkglib_LIBRARIES=libclientcomm.a libclientcomm_a_SOURCES = rpcif_clnt.cc rpcif_xdr.c rpcif.h \ clientcomm.cc clientcomm.hh rpcclientcomm.cc \ @@ -47,7 +44,9 @@ libclientcomm_a_SOURCES = rpcif_clnt.cc rpcif_xdr.c rpcif.h \ ../rnprotocol/rnpclientcomm.cc \ ../rnprotocol/rnpclientcomm2.cc \ ../rnprotocol/rnpclientcomm.hh -libclientcomm_a_CPPFLAGS=-I../rnprotocol +libclientcomm_a_CPPFLAGS = $(AM_CPPFLAGS) +libclientcomm_a_CPPFLAGS += -I../rnprotocol +libclientcomm_a_CPPFLAGS += $(CLIENT_CPPFLAGS) EXTRA_libclientcomm_a_SOURCES = rpcif.x BUILT_SOURCES= rpcif_clnt.cc rpcif_xdr.c rpcif.h rpcif_svc.cc diff --git a/compression/Makefile.am b/compression/Makefile.am index a21966f..131cdae 100644 --- a/compression/Makefile.am +++ b/compression/Makefile.am @@ -28,8 +28,8 @@ # ################################################################## -AM_CXXFLAGS=@CLIENTCXXFLAGS@ -AM_LDFLAGS=@CLIENTLDFLAGS@ - pkglib_LIBRARIES = libcompression.a libcompression_a_SOURCES=tilecompression.cc tilecompression.hh tilecompnone.cc tilecompnone.hh + +libcompression_a_CPPFLAGS = $(AM_CPPFLAGS) +libcompression_a_CPPFLAGS += $(CLIENT_CPPFLAGS) diff --git a/configure.ac b/configure.ac index 955d535..af69a69 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,15 @@ AC_PREREQ(2.61) AC_INIT(Rasdaman, 8.0.0, baumann@rasdaman.com) RMANVERSION=8000 AM_INIT_AUTOMAKE() + +# Save original CFLAGS, CPPFLAGS, CXXFLAGS values. +orig_CFLAGS="$CFLAGS" +orig_CPPFLAGS="$CPPFLAGS" +orig_CXXFLAGS="$CXXFLAGS" +orig_LDFLAGS="$LDFLAGS" # Define CXXFLAGS before AC_PROG_CXX or it will automatically add -g -O2 on some systems +CFLAGS= +CPPFLAGS= CXXFLAGS= GCJFLAGS= @@ -209,7 +217,7 @@ AC_ARG_ENABLE([debug], AC_ARG_ENABLE([benchmark], [AS_HELP_STRING([--enable-benchmark], [this feature enables generation of binaries that contain extra code for benchmark output.])], - [CXXFLAGS+=-DRMANBENCHMARK ], + [AM_CPPFLAGS+=" -DRMANBENCHMARK"], []) AC_ARG_WITH([test-server], @@ -261,9 +269,8 @@ AS_IF([test "$with_default_basedb" == postgresql], EMBEDDEDSQLEXT="pgc" EMBEDDEDSQLOUT="cc" - BASEDBCXXFLAGS=" $POSTGRESQL_CFLAGS" - BASEDBLDFLAGS="$POSTGRESQL_LDFLAGS -lz -lecpg" - STATICBASEDBFLAGS="$BASEDBLDFLAGS" + BASEDB_CFLAGS=" $POSTGRESQL_CFLAGS" + BASEDB_LIBS="$POSTGRESQL_LDFLAGS -lz -lecpg" LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS" AC_PROG_ECPG @@ -295,14 +302,16 @@ fi AS_IF([test "x$RMANDEBUG" != x], [AC_DEFINE([RMANDEBUG]) AC_DEFINE([DEBUG]) - CXXFLAGS+=" -g" + AM_CFLAGS+=" -g" + AM_CXXFLAGS+=" -g" ], [ AC_DEFINE([__NO_MATH_INLINES]) - CXXFLAGS+=" -O2" + AM_CFLAGS+=" -O2" + AM_CXXFLAGS+=" -O2" ]) -CXXFLAGS+=" -fPIC" -CFLAGS+=" -fPIC" +AM_CXXFLAGS+=" -fPIC" +AM_CFLAGS+=" -fPIC" AC_DEFINE_UNQUOTED([RMANVERSION], [$RMANVERSION]) AC_DEFINE_UNQUOTED([BASEDBSTRING], ["$BASEDBSTRING"]) AC_DEFINE([EARLY_TEMPLATE]) @@ -313,19 +322,20 @@ AC_DEFINE([RASARCHITECTURE], ["X86"]) AC_DEFINE([RASSCHEMAVERSION], [5]) AC_DEFINE([NOPRE]) # if not on DEC Alpha -BASEDBLDFLAGS+=" -lnsl" -STATICBASEDBLDFLAGS+=" -lnsl" +BASEDB_LIBS+=" -lnsl" # endif AC_DEFINE([NO_in_addr_t]) -BASEDBCXXFLAGS+=" $DBIF_INC" +BASEDB_CPPFLAGS+=" $DBIF_INC" -CLIENTCXXFLAGS="$CXXFLAGS" -CLIENTLDFLAGS="$CXXLDFLAGS" +CLIENT_CPPFLAGS="$CPPFLAGS" +CLIENT_LDFLAGS="$LDFLAGS" +CPPFLAGS="" +LDFLAGS="" COMPDATE=`date +"%d.%m.%Y %H:%M:%S"` AC_DEFINE_UNQUOTED([COMPDATE], ["$COMPDATE"]) -CXXFLAGS+=" -I$abs_top_srcdir -I$abs_top_srcdir/debug -I$abs_top_srcdir/include" +AM_CPPFLAGS+=" -I$abs_top_srcdir -I$abs_top_srcdir/debug -I$abs_top_srcdir/include" # Our special install locations AC_SUBST([pkgdatadir], ["\${datadir}/\${RDM_SUBDIR}"]) @@ -346,10 +356,10 @@ AC_SUBST([rdmexecbindir], ["\${pkglibdir}/bin"]) AC_SUBST(EMBEDDEDSQLPRECOMPILER) AC_SUBST(EMBEDDEDSQLEXT) AC_SUBST(EMBEDDEDSQLOUT) -AC_SUBST(BASEDBCXXFLAGS) -AC_SUBST(BASEDBLDFLAGS) -AC_SUBST(CLIENTCXXFLAGS) -AC_SUBST(CLIENTLDFLAGS) +AC_SUBST(BASEDB_CPPFLAGS) +AC_SUBST(BASEDB_LIBS) +AC_SUBST(CLIENT_CPPFLAGS) +AC_SUBST(CLIENT_LIBS) AC_SUBST(DB2_INC) AC_SUBST(DB2_INSTANCEPATH) AC_SUBST(DB2_CPPLIBS) @@ -362,14 +372,24 @@ AC_SUBST(ORALDFLAGS) AC_SUBST(RASMGR_PORT) AC_SUBST(REL_STATIC_LIBS) AC_SUBST(RMANBASE) -AC_SUBST(STATICBASEDBFLAGS) AC_SUBST(logdir) #Directories used in the source-code -CXXFLAGS="$CXXFLAGS -DSHARE_DATA_DIR=\\\"\$(pkgdatadir)/\\\"" -CXXFLAGS="$CXXFLAGS -DCONFDIR=\\\"\$(sysconfdir)/\\\"" -CXXFLAGS="$CXXFLAGS -DBINDIR=\\\"\$(bindir)/\\\"" -CXXFLAGS="$CXXFLAGS -DLOGDIR=\\\"\$(logdir)/\\\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DSHARE_DATA_DIR=\\\"\$(pkgdatadir)/\\\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DCONFDIR=\\\"\$(sysconfdir)/\\\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DBINDIR=\\\"\$(bindir)/\\\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DLOGDIR=\\\"\$(logdir)/\\\"" + +AC_SUBST([AM_CFLAGS]) +AC_SUBST([AM_CPPFLAGS]) +AC_SUBST([AM_CXXFLAGS]) + +# Restore the flags with the user supplied values for proper +# substitution in the Makefile files. +CFLAGS="$orig_CFLAGS" +CPPFLAGS="$orig_CPPFLAGS" +CXXFLAGS="$orig_CXXFLAGS" +LDFLAGS="$orig_LDFLAGS" AC_OUTPUT diff --git a/httpserver/Makefile.am b/httpserver/Makefile.am index 6a26c0a..2b02fc8 100644 --- a/httpserver/Makefile.am +++ b/httpserver/Makefile.am @@ -25,7 +25,6 @@ ################################################################## pkglib_LIBRARIES=libhttpserver.a -AM_CFLAGS=$(CXXFLAGS) libhttpserver_a_SOURCES= types.h http.h server.h defs.h http-defs.h protos.h \ logging.cc signals.cc config.cc support.cc childs.cc init.cc \ http-support.cc http-methods.cc http-fields.cc http-date.cc \ diff --git a/insertutils/Makefile.am b/insertutils/Makefile.am index d2bf0c0..4eb646e 100644 --- a/insertutils/Makefile.am +++ b/insertutils/Makefile.am @@ -29,8 +29,6 @@ # ################################################################## -AM_CXXFLAGS = $(COMMCXXFLAGS) -AM_LDFLAGS = $(COMMLDFLAGS) bin_PROGRAMS = insertppm rdmexecbin_SCRIPTS = insertdemo.sh insertppm_SOURCES=insertppm.cc ../mymalloc/mymalloc_cln.cc @@ -38,6 +36,11 @@ insertppm_LDADD=../rasodmg/librasodmg.a ../clientcomm/libclientcomm.a \ ../compression/libcompression.a ../conversion/libconversion.a \ ../raslib/libraslib.a \ ../network/libnetwork.a + +insertppm_CPPFLAGS = $(AM_CPPFLAGS) +insertppm_CPPFLAGS += $(COMM_CPPFLAGS) +insertppm_LDADD += $(COMM_LIBS) + CLEANFILES = insertdemo.sh EXTRA_DIST = insertdemo.sh.in diff --git a/mddmgr/Makefile.am b/mddmgr/Makefile.am index f0324a5..dd02091 100644 --- a/mddmgr/Makefile.am +++ b/mddmgr/Makefile.am @@ -28,9 +28,9 @@ # ################################################################## -AM_CXXFLAGS=@BASEDBCXXFLAGS@ - pkglib_LIBRARIES= libmddmgr.a +libmddmgr_a_CPPFLAGS = $(AM_CPPFLAGS) +libmddmgr_a_CPPFLAGS += $(BASEDB_CPPFLAGS) libmddmgr_a_SOURCES= mddobj.cc mddobj.hh \ mddcoll.cc mddcoll.hh \ mddcolliter.cc mddcolliter.icc mddcolliter.hh diff --git a/qlparser/Makefile.am b/qlparser/Makefile.am index 4d5ce41..1ff4ec2 100644 --- a/qlparser/Makefile.am +++ b/qlparser/Makefile.am @@ -39,8 +39,8 @@ AM_LFLAGS=-i -I YACC = bison # -d generates token definitions in .h file AM_YFLAGS=-d -y -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_CFLAGS=$(CXXFLAGS) +libqlparser_a_CPPFLAGS = $(AM_CPPFLAGS) +libqlparser_a_CPPFLAGS += $(BASEDB_CPPFLAGS) libqlparser_a_SOURCES=oql.yy lex.ll alloca.c\ symtab.cc symtab.hh \ qtoncstream.cc qtoncstream.hh qtoncstream.icc \ diff --git a/rasdl/Makefile.am b/rasdl/Makefile.am index 171c05f..27a3e49 100644 --- a/rasdl/Makefile.am +++ b/rasdl/Makefile.am @@ -32,8 +32,6 @@ AM_LFLAGS=-I YACC = bison AM_YFLAGS=-d -y -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ bin_PROGRAMS=rasdl rasdl_SOURCES=lex.ll odl.yy parse.cc parse.hh symbtbl.cc symbtbl.hh \ @@ -48,6 +46,10 @@ rasdl_LDADD = ../reladminif/libreladminif.a ../relmddif/librelmddif.a \ ../compression/libcompression.a ../commline/libcommline.a ../raslib/libraslib.a \ ../conversion/libconversion.a ../rasodmg/librasodmg.a +rasdl_CPPFLAGS = $(AM_CPPFLAGS) +rasdl_CPPFLAGS += $(BASEDB_CPPFLAGS) +rasdl_LDADD += $(BASEDB_LIBS) + BUILT_SOURCES=lex.cc odl.cc odl.h CLEANFILES=lex.cc odl.cc odl.h diff --git a/raslib/Makefile.am b/raslib/Makefile.am index 34d9ee0..3094c32 100644 --- a/raslib/Makefile.am +++ b/raslib/Makefile.am @@ -28,8 +28,8 @@ # ################################################################## -AM_CXXFLAGS=@CLIENTCXXFLAGS@ -AM_LDFLAGS=@CLIENTLDFLAGS@ +libraslib_a_CPPFLAGS = $(AM_CPPFLAGS) +libraslib_a_CPPFLAGS += $(CLIENT_CPPFLAGS) pkglib_LIBRARIES=libraslib.a libraslib_a_SOURCES= sinterval.hh dlist.hh point.hh minterval.hh error.hh \ diff --git a/rasodmg/Makefile.am b/rasodmg/Makefile.am index dc720e5..1b12d01 100644 --- a/rasodmg/Makefile.am +++ b/rasodmg/Makefile.am @@ -28,11 +28,11 @@ # ################################################################## -AM_CXXFLAGS=@CLIENTCXXFLAGS@ -AM_LDFLAGS=@CLIENTLDFLAGS@ - pkglib_LIBRARIES=librasodmg.a +librasodmg_a_CPPFLAGS = $(AM_CPPFLAGS) +librasodmg_a_CPPFLAGS += $(CLIENT_CPPFLAGS) + librasodmg_a_SOURCES = collection.cc collection.hh collection.icc \ set.cc set.hh \ iterator.cc iterator.hh iterator.icc \ diff --git a/reladminif/Makefile.am b/reladminif/Makefile.am index dae8ff3..0bdb68f 100644 --- a/reladminif/Makefile.am +++ b/reladminif/Makefile.am @@ -30,9 +30,6 @@ # ################################################################## -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ - .SUFFIXES= .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< @@ -53,6 +50,8 @@ EXTRA_libreladminif_a_SOURCES=adminif.pgc databaseif.pgc transactionif.pgc \ libreladminif_a_LIBADD= adminif.$(OBJEXT) databaseif.$(OBJEXT) transactionif.$(OBJEXT) \ sqlerror.$(OBJEXT) oidif.$(OBJEXT) objectbroker.$(OBJEXT) +libreladminif_a_CPPFLAGS = $(AM_CPPFLAGS) +libreladminif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) libreladminif_a_DEPENDENCIES= adminif.$(OBJEXT) databaseif.$(OBJEXT) transactionif.$(OBJEXT) \ sqlerror.$(OBJEXT) oidif.$(OBJEXT) objectbroker.$(OBJEXT) diff --git a/relblobif/Makefile.am b/relblobif/Makefile.am index d6ac166..e1da954 100644 --- a/relblobif/Makefile.am +++ b/relblobif/Makefile.am @@ -29,9 +29,6 @@ # ################################################################## -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ - .SUFFIXES= .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< @@ -45,6 +42,9 @@ EXTRA_librelblobif_a_SOURCES=blobtile.pgc librelblobif_a_LIBADD=blobtile.$(OBJEXT) librelblobif_a_DEPENDENCIES=blobtile.$(OBJEXT) +librelblobif_a_CPPFLAGS = $(AM_CPPFLAGS) +librelblobif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) + BUILT_SOURCES=blobtile.@EMBEDDEDSQLOUT@ CLEANFILES=blobtile.@EMBEDDEDSQLOUT@ client.bm client.dbg client.log ir.out \ diff --git a/relcatalogif/Makefile.am b/relcatalogif/Makefile.am index add1d28..6fec2cc 100644 --- a/relcatalogif/Makefile.am +++ b/relcatalogif/Makefile.am @@ -33,9 +33,6 @@ ######################### Definitions ############################ -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ - .SUFFIXES= .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< @@ -55,6 +52,9 @@ librelcatalogif_a_LIBADD= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJE librelcatalogif_a_DEPENDENCIES= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJEXT) mdddimensiontype.$(OBJEXT) \ structtype.$(OBJEXT) dbminterval.$(OBJEXT) mdddomaintype.$(OBJEXT) +librelcatalogif_a_CPPFLAGS = $(AM_CPPFLAGS) +librelcatalogif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) + BUILT_SOURCES= settype.@EMBEDDEDSQLOUT@ mddtype.@EMBEDDEDSQLOUT@ mddbasetype.@EMBEDDEDSQLOUT@ \ mdddimensiontype.@EMBEDDEDSQLOUT@ structtype.@EMBEDDEDSQLOUT@ dbminterval.@EMBEDDEDSQLOUT@ \ mdddomaintype.@EMBEDDEDSQLOUT@ diff --git a/relindexif/Makefile.am b/relindexif/Makefile.am index 6ece7b4..40711d0 100644 --- a/relindexif/Makefile.am +++ b/relindexif/Makefile.am @@ -26,9 +26,6 @@ # ################################################################## -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ - .SUFFIXES= .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< @@ -43,6 +40,9 @@ EXTRA_librelindexif_a_SOURCES=dbrcindexds.pgc dbtcindex.pgc hierindex.pgc librelindexif_a_LIBADD=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierindex.$(OBJEXT) librelindexif_a_DEPENDENCIES=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierindex.$(OBJEXT) +librelindexif_a_CPPFLAGS = $(AM_CPPFLAGS) +librelindexif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) + BUILT_SOURCES=dbrcindexds.@EMBEDDEDSQLOUT@ dbtcindex.@EMBEDDEDSQLOUT@ hierindex.@EMBEDDEDSQLOUT@ CLEANFILES=dbrcindexds.@EMBEDDEDSQLOUT@ dbtcindex.@EMBEDDEDSQLOUT@ hierindex.@EMBEDDEDSQLOUT@ diff --git a/relmddif/Makefile.am b/relmddif/Makefile.am index 1bc9f82..daf85ac 100644 --- a/relmddif/Makefile.am +++ b/relmddif/Makefile.am @@ -29,9 +29,6 @@ # ################################################################## -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ - .SUFFIXES= .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< @@ -42,6 +39,9 @@ EXTRA_librelmddif_a_SOURCES= dbmddobj.pgc dbmddset.pgc librelmddif_a_LIBADD=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT) librelmddif_a_DEPENDENCIES=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT) +librelmddif_a_CPPFLAGS = $(AM_CPPFLAGS) +librelmddif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) + BUILT_SOURCES=dbmddobj.@EMBEDDEDSQLOUT@ dbmddset.@EMBEDDEDSQLOUT@ CLEANFILES=dbmddobj.@EMBEDDEDSQLOUT@ dbmddset.@EMBEDDEDSQLOUT@ \ diff --git a/relstorageif/Makefile.am b/relstorageif/Makefile.am index f316778..03d3284 100644 --- a/relstorageif/Makefile.am +++ b/relstorageif/Makefile.am @@ -28,9 +28,6 @@ # ################################################################## -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ - .SUFFIXES= .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: $(EMBEDDEDSQLPRECOMPILER) $@ $< @@ -42,6 +39,9 @@ EXTRA_librelstorageif_a_SOURCES= dbstoragelayout.pgc librelstorageif_a_LIBADD= dbstoragelayout.$(OBJEXT) librelstorageif_a_DEPENDENCIES= dbstoragelayout.$(OBJEXT) +librelstorageif_a_CPPFLAGS = $(AM_CPPFLAGS) +librelstorageif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) + BUILT_SOURCES= dbstoragelayout.@EMBEDDEDSQLOUT@ diff --git a/server/Makefile.am b/server/Makefile.am index 96e98c5..b79dba7 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -29,9 +29,6 @@ # ################################################################## -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ - bin_PROGRAMS=rasserver rasserver_SOURCES=rasserver_main.cc rasserver_config.cc rasserver_entry.cc \ createinitmdd.cc rasserver_config.hh rasserver_entry.hh \ @@ -50,6 +47,10 @@ rasserver_LDADD=../servercomm/libservercomm.a ../qlparser/libqlparser.a ../conve ../compression/libcompression.a \ ../relcatalogif/librelcatalogif.a ../raslib/libraslib.a +rasserver_CPPFLAGS = $(AM_CPPFLAGS) +rasserver_CPPFLAGS += $(BASEDB_CPPFLAGS) +rasserver_LDADD += $(BASEDB_LIBS) + SUBDIRS = ../relblobif ../relindexif ../relmddif ../relcatalogif ../reladminif ../relstorageif \ ../indexmgr ../catalogmgr ../tilemgr ../storagemgr ../commline ../network \ ../raslib ../servercomm ../rasodmg ../qlparser ../conversion \ diff --git a/servercomm/Makefile.am b/servercomm/Makefile.am index 7314248..6bb13f6 100644 --- a/servercomm/Makefile.am +++ b/servercomm/Makefile.am @@ -28,9 +28,6 @@ # ################################################################## -AM_CXXFLAGS=@BASEDBCXXFLAGS@ -AM_LDFLAGS=@BASEDBLDFLAGS@ - pkglib_LIBRARIES=libservercomm.a libservercomm_a_SOURCES=../clientcomm/rpcif_xdr.c ../clientcomm/rpcif_svc.cc servercomm.cc \ servercomm2.cc manager.cc callbackmgr.cc httpserver.cc \ @@ -51,7 +48,10 @@ libservercomm_a_SOURCES=../clientcomm/rpcif_xdr.c ../clientcomm/rpcif_svc.cc ser ../rnprotocol/rnprasserver.hh \ ../rnprotocol/rnpservercomm.cc \ ../rnprotocol/rnpservercomm.hh -libservercomm_a_CPPFLAGS=-I../rnprotocol + +libservercomm_a_CPPFLAGS = $(AM_CPPFLAGS) +libservercomm_a_CPPFLAGS += -I../rnprotocol +libservercomm_a_CPPFLAGS += $(BASEDB_CPPFLAGS) BUILT_SOURCES=../clientcomm/rpcif_xdr.c ../clientcomm/rpcif.h ../clientcomm/rpcif_svc.cc |