diff options
-rw-r--r-- | .gitignore | 17 | ||||
-rw-r--r-- | applications/rasql/Makefile.am | 8 | ||||
-rw-r--r-- | catalogmgr/Makefile.am | 10 | ||||
-rw-r--r-- | clientcomm/Makefile.am | 14 | ||||
-rw-r--r-- | commline/Makefile.am | 4 | ||||
-rw-r--r-- | compression/Makefile.am | 8 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | conversion/Makefile.am | 4 | ||||
-rw-r--r-- | httpserver/Makefile.am | 4 | ||||
-rw-r--r-- | indexmgr/Makefile.am | 4 | ||||
-rw-r--r-- | insertutils/Makefile.am | 8 | ||||
-rw-r--r-- | mddmgr/Makefile.am | 8 | ||||
-rw-r--r-- | network/Makefile.am | 4 | ||||
-rw-r--r-- | qlparser/Makefile.am | 10 | ||||
-rw-r--r-- | rascontrol/Makefile.am | 4 | ||||
-rw-r--r-- | rasdl/Makefile.am | 14 | ||||
-rw-r--r-- | raslib/Makefile.am | 8 | ||||
-rw-r--r-- | rasmgr/Makefile.am | 2 | ||||
-rw-r--r-- | rasodmg/Makefile.am | 8 | ||||
-rw-r--r-- | reladminif/Makefile.am | 14 | ||||
-rw-r--r-- | relblobif/Makefile.am | 14 | ||||
-rw-r--r-- | relcatalogif/Makefile.am | 14 | ||||
-rw-r--r-- | relindexif/Makefile.am | 14 | ||||
-rw-r--r-- | relmddif/Makefile.am | 14 | ||||
-rw-r--r-- | relstorageif/Makefile.am | 14 | ||||
-rw-r--r-- | server/Makefile.am | 20 | ||||
-rw-r--r-- | servercomm/Makefile.am | 16 | ||||
-rw-r--r-- | storagemgr/Makefile.am | 4 | ||||
-rw-r--r-- | tilemgr/Makefile.am | 4 |
29 files changed, 149 insertions, 128 deletions
@@ -5,11 +5,16 @@ # Patterns matching built files in many subdirs .deps -*.o *.a +*.o + *.class *.war +.libs +*.la +*.lo + # Subdirectories for test builds and installs /_b/ /_i/ @@ -28,6 +33,7 @@ # Generated by ./configure run /config.log /config.status +/libtool # These are all generated files under openrasdaman dbparams.properties @@ -155,7 +161,16 @@ dbparams.properties /aclocal.m4 /configure /compile +/config.guess +/config.sub /depcomp /install-sh +/ltmain.sh /missing /ylwrap + +/m4/libtool.m4 +/m4/ltoptions.m4 +/m4/ltsugar.m4 +/m4/ltversion.m4 +/m4/lt~obsolete.m4 diff --git a/applications/rasql/Makefile.am b/applications/rasql/Makefile.am index ddd7ea0..d7b0c34 100644 --- a/applications/rasql/Makefile.am +++ b/applications/rasql/Makefile.am @@ -33,10 +33,10 @@ 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 = ../../rasodmg/librasodmg.la ../../clientcomm/libclientcomm.la \ + ../../compression/libcompression.la ../../raslib/libraslib.la \ + ../../conversion/libconversion.la ../../commline/libcommline.la \ + ../../network/libnetwork.la rasql_LDADD += $(CLIENT_LIBS) SUBDIRS= ../../rasodmg ../../clientcomm ../../compression \ diff --git a/catalogmgr/Makefile.am b/catalogmgr/Makefile.am index a38dea4..f774bf3 100644 --- a/catalogmgr/Makefile.am +++ b/catalogmgr/Makefile.am @@ -29,11 +29,11 @@ # object files to put in library -pkglib_LIBRARIES=libcatalogmgr.a -libcatalogmgr_a_SOURCES=ops.cc typefactory.cc algebraops.cc ops.hh \ +pkglib_LTLIBRARIES = libcatalogmgr.la +libcatalogmgr_la_SOURCES=ops.cc typefactory.cc algebraops.cc ops.hh \ typefactory.hh algebraops.hh autogen_ops.hh -libcatalogmgr_a_CPPFLAGS = $(AM_CPPFLAGS) -libcatalogmgr_a_CPPFLAGS += $(BASEDB_CPPFLAGS) +libcatalogmgr_la_CPPFLAGS = $(AM_CPPFLAGS) +libcatalogmgr_la_CPPFLAGS += $(BASEDB_CPPFLAGS) -EXTRA_libcatalogmgr_a_SOURCES = autogen_ops.cc +EXTRA_libcatalogmgr_la_SOURCES = autogen_ops.cc diff --git a/clientcomm/Makefile.am b/clientcomm/Makefile.am index 3e1c03b..c2e6f43 100644 --- a/clientcomm/Makefile.am +++ b/clientcomm/Makefile.am @@ -29,9 +29,9 @@ # ################################################################## -pkglib_LIBRARIES=libclientcomm.a -nodist_libclientcomm_a_SOURCES = rpcif_clnt.cc rpcif_xdr.c rpcif.h -libclientcomm_a_SOURCES = clientcomm.cc clientcomm.hh rpcclientcomm.cc \ +pkglib_LTLIBRARIES = libclientcomm.la +nodist_libclientcomm_la_SOURCES = rpcif_clnt.cc rpcif_xdr.c rpcif.h +libclientcomm_la_SOURCES = clientcomm.cc clientcomm.hh rpcclientcomm.cc \ rpcclientcomm.hh clientcomm.icc \ ../mymalloc/mymalloc_cln.cc ../mymalloc/mymalloc.h \ ../rnprotocol/rnprotocol.cc \ @@ -44,11 +44,11 @@ libclientcomm_a_SOURCES = clientcomm.cc clientcomm.hh rpcclientcomm.cc \ ../rnprotocol/rnpclientcomm.cc \ ../rnprotocol/rnpclientcomm2.cc \ ../rnprotocol/rnpclientcomm.hh -libclientcomm_a_CPPFLAGS = $(AM_CPPFLAGS) -libclientcomm_a_CPPFLAGS += -I$(top_srcdir)/rnprotocol -libclientcomm_a_CPPFLAGS += $(CLIENT_CPPFLAGS) +libclientcomm_la_CPPFLAGS = $(AM_CPPFLAGS) +libclientcomm_la_CPPFLAGS += -I$(top_srcdir)/rnprotocol +libclientcomm_la_CPPFLAGS += $(CLIENT_CPPFLAGS) -EXTRA_libclientcomm_a_SOURCES = rpcif.x +EXTRA_libclientcomm_la_SOURCES = rpcif.x BUILT_SOURCES = CLEANFILES = diff --git a/commline/Makefile.am b/commline/Makefile.am index 991510c..f29162a 100644 --- a/commline/Makefile.am +++ b/commline/Makefile.am @@ -27,5 +27,5 @@ # ################################################################## -pkglib_LIBRARIES=libcommline.a -libcommline_a_SOURCES=cmlparser.cc cmlparser.hh +pkglib_LTLIBRARIES = libcommline.la +libcommline_la_SOURCES=cmlparser.cc cmlparser.hh diff --git a/compression/Makefile.am b/compression/Makefile.am index 131cdae..42186f6 100644 --- a/compression/Makefile.am +++ b/compression/Makefile.am @@ -28,8 +28,8 @@ # ################################################################## -pkglib_LIBRARIES = libcompression.a -libcompression_a_SOURCES=tilecompression.cc tilecompression.hh tilecompnone.cc tilecompnone.hh +pkglib_LTLIBRARIES = libcompression.la +libcompression_la_SOURCES=tilecompression.cc tilecompression.hh tilecompnone.cc tilecompnone.hh -libcompression_a_CPPFLAGS = $(AM_CPPFLAGS) -libcompression_a_CPPFLAGS += $(CLIENT_CPPFLAGS) +libcompression_la_CPPFLAGS = $(AM_CPPFLAGS) +libcompression_la_CPPFLAGS += $(CLIENT_CPPFLAGS) diff --git a/configure.ac b/configure.ac index c859491..dce40db 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,14 @@ AC_SUBST([RDM_SUBDIR]) AC_MSG_CHECKING([install subdirectory name]) AC_MSG_RESULT([$RDM_SUBDIR]) +# Use libtool for compiling and linking, but only with static +# libraries so far. Dynamic libraries need some more thoughts about +# sonames, and a strategy for maintaining and breaking API and ABI +# compatibility, and managing C++ ABI issues. +LT_INIT([disable-shared]) +LT_LANG([C]) +LT_LANG([C++]) + # Checks for programs. AC_PROG_CXX AC_PROG_AWK @@ -327,8 +335,6 @@ AS_IF([test "x$RMANDEBUG" != x], AM_CFLAGS+=" -O2" AM_CXXFLAGS+=" -O2" ]) -AM_CXXFLAGS+=" -fPIC" -AM_CFLAGS+=" -fPIC" AC_DEFINE_UNQUOTED([RMANVERSION], [$RMANVERSION]) AC_DEFINE_UNQUOTED([BASEDBSTRING], ["$BASEDBSTRING"]) AC_DEFINE([EARLY_TEMPLATE]) diff --git a/conversion/Makefile.am b/conversion/Makefile.am index 751ff38..5b73919 100644 --- a/conversion/Makefile.am +++ b/conversion/Makefile.am @@ -29,8 +29,8 @@ # ################################################################## -pkglib_LIBRARIES=libconversion.a -libconversion_a_SOURCES= convertor.cc convfactory.cc tiff.cc hdf.cc png.cc jpeg.cc \ +pkglib_LTLIBRARIES = libconversion.la +libconversion_la_SOURCES= convertor.cc convfactory.cc tiff.cc hdf.cc png.cc jpeg.cc \ csv.cc bmp.cc vff.cc tor.cc dem.cc ecw.cc memfs.cc \ convertor.hh convfactory.hh tiff.hh hdf.hh png.hh jpeg.hh \ csv.hh bmp.hh vff.hh tor.hh dem.hh ecw.hh memfs.hh \ diff --git a/httpserver/Makefile.am b/httpserver/Makefile.am index 2b02fc8..056f9c4 100644 --- a/httpserver/Makefile.am +++ b/httpserver/Makefile.am @@ -24,8 +24,8 @@ # ################################################################## -pkglib_LIBRARIES=libhttpserver.a -libhttpserver_a_SOURCES= types.h http.h server.h defs.h http-defs.h protos.h \ +pkglib_LTLIBRARIES = libhttpserver.la +libhttpserver_la_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 \ http-error.cc http-readmsg.cc http-writemsg.cc \ diff --git a/indexmgr/Makefile.am b/indexmgr/Makefile.am index 6303ef9..4e30000 100644 --- a/indexmgr/Makefile.am +++ b/indexmgr/Makefile.am @@ -29,8 +29,8 @@ # ################################################################## -pkglib_LIBRARIES=libindexmgr.a -libindexmgr_a_SOURCES= mddobjix.cc transdirix.cc keyobject.cc srptindexlogic.cc \ +pkglib_LTLIBRARIES = libindexmgr.la +libindexmgr_la_SOURCES= mddobjix.cc transdirix.cc keyobject.cc srptindexlogic.cc \ sdirindexlogic.cc indexds.cc hierindexds.cc srcindexlogic.cc \ mddobjix.hh transdirix.hh keyobject.hh srptindexlogic.hh \ sdirindexlogic.hh indexds.hh hierindexds.hh srcindexlogic.hh diff --git a/insertutils/Makefile.am b/insertutils/Makefile.am index b8f74fe..4e720ac 100644 --- a/insertutils/Makefile.am +++ b/insertutils/Makefile.am @@ -32,10 +32,10 @@ bin_PROGRAMS = insertppm rdmexecbin_SCRIPTS = insertdemo.sh insertppm_SOURCES=insertppm.cc ../mymalloc/mymalloc_cln.cc -insertppm_LDADD=../rasodmg/librasodmg.a ../clientcomm/libclientcomm.a \ - ../compression/libcompression.a ../conversion/libconversion.a \ - ../raslib/libraslib.a \ - ../network/libnetwork.a +insertppm_LDADD=../rasodmg/librasodmg.la ../clientcomm/libclientcomm.la \ + ../compression/libcompression.la ../conversion/libconversion.la \ + ../raslib/libraslib.la \ + ../network/libnetwork.la insertppm_CPPFLAGS = $(AM_CPPFLAGS) insertppm_CPPFLAGS += $(COMM_CPPFLAGS) diff --git a/mddmgr/Makefile.am b/mddmgr/Makefile.am index dd02091..62cfcbf 100644 --- a/mddmgr/Makefile.am +++ b/mddmgr/Makefile.am @@ -28,10 +28,10 @@ # ################################################################## -pkglib_LIBRARIES= libmddmgr.a -libmddmgr_a_CPPFLAGS = $(AM_CPPFLAGS) -libmddmgr_a_CPPFLAGS += $(BASEDB_CPPFLAGS) -libmddmgr_a_SOURCES= mddobj.cc mddobj.hh \ +pkglib_LTLIBRARIES = libmddmgr.la +libmddmgr_la_CPPFLAGS = $(AM_CPPFLAGS) +libmddmgr_la_CPPFLAGS += $(BASEDB_CPPFLAGS) +libmddmgr_la_SOURCES= mddobj.cc mddobj.hh \ mddcoll.cc mddcoll.hh \ mddcolliter.cc mddcolliter.icc mddcolliter.hh diff --git a/network/Makefile.am b/network/Makefile.am index c5315f1..78f9f72 100644 --- a/network/Makefile.am +++ b/network/Makefile.am @@ -28,8 +28,8 @@ # ################################################################## -pkglib_LIBRARIES=libnetwork.a -libnetwork_a_SOURCES= akgnet_commbuffer.cc akgnet_commbuffer.hh \ +pkglib_LTLIBRARIES = libnetwork.la +libnetwork_la_SOURCES= akgnet_commbuffer.cc akgnet_commbuffer.hh \ akgnet_file.cc akgnet_file.hh \ akgnet_nbcomm.cc akgnet_nbcomm.hh \ akgnet_server.cc akgnet_server.hh \ diff --git a/qlparser/Makefile.am b/qlparser/Makefile.am index 1ff4ec2..b217a88 100644 --- a/qlparser/Makefile.am +++ b/qlparser/Makefile.am @@ -30,7 +30,7 @@ # ################################################################## -pkglib_LIBRARIES=libqlparser.a +pkglib_LTLIBRARIES = libqlparser.la # -I gnererates an interactive scanner which doesn't try to look ahead past a newline # -i generates a scanner which doesn't care about upper and lower case; doesn't work @@ -39,9 +39,9 @@ AM_LFLAGS=-i -I YACC = bison # -d generates token definitions in .h file AM_YFLAGS=-d -y -libqlparser_a_CPPFLAGS = $(AM_CPPFLAGS) -libqlparser_a_CPPFLAGS += $(BASEDB_CPPFLAGS) -libqlparser_a_SOURCES=oql.yy lex.ll alloca.c\ +libqlparser_la_CPPFLAGS = $(AM_CPPFLAGS) +libqlparser_la_CPPFLAGS += $(BASEDB_CPPFLAGS) +libqlparser_la_SOURCES=oql.yy lex.ll alloca.c\ symtab.cc symtab.hh \ qtoncstream.cc qtoncstream.hh qtoncstream.icc \ qtmddaccess.cc qtmddaccess.hh qtmddaccess.icc \ @@ -90,7 +90,7 @@ libqlparser_a_SOURCES=oql.yy lex.ll alloca.c\ qtmddconfig.hh qtmddconfig.cc \ qtmddcfgop.hh qtmddcfgop.cc -EXTRA_libqlparser_a_SOURCES = autogen_qtui.hh autogen_qtui.icc autogen_qtui.cc +EXTRA_libqlparser_la_SOURCES = autogen_qtui.hh autogen_qtui.icc autogen_qtui.cc BUILT_SOURCES=lex.cc oql.cc oql.h CLEANFILES=lex.cc oql.cc oql.h diff --git a/rascontrol/Makefile.am b/rascontrol/Makefile.am index 16d4ee0..7c416dc 100644 --- a/rascontrol/Makefile.am +++ b/rascontrol/Makefile.am @@ -38,13 +38,13 @@ rascontrol_SOURCES=rascontrol.cc rascontrol_class.cc rascontrol.hh \ ../rasmgr/ras_crypto.cc ../rasmgr/ras_crypto.hh \ rasmgr_utils_conf.cc rasmgr_utils_conf.hh \ rasmgr_utils_comm.cc rasmgr_utils_comm.hh -rascontrol_LDADD = ../network/libnetwork.a ../commline/libcommline.a +rascontrol_LDADD = ../network/libnetwork.la ../commline/libcommline.la raspasswd_SOURCES=raspasswd.cc raspasswd.hh \ ../rasmgr/ras_crypto.cc ../rasmgr/ras_crypto.hh \ rasmgr_utils_comm.cc rasmgr_utils_comm.hh \ rasmgr_utils_conf.cc rasmgr_utils_conf.hh -raspasswd_LDADD = ../network/libnetwork.a ../commline/libcommline.a +raspasswd_LDADD = ../network/libnetwork.la ../commline/libcommline.la SUBDIRS=../network ../commline diff --git a/rasdl/Makefile.am b/rasdl/Makefile.am index 27a3e49..fbb3620 100644 --- a/rasdl/Makefile.am +++ b/rasdl/Makefile.am @@ -38,13 +38,13 @@ rasdl_SOURCES=lex.ll odl.yy parse.cc parse.hh symbtbl.cc symbtbl.hh \ alloca.cc rasdl.cc rasdl_error.cc rasdl_error.hh \ template_inst.hh yparse.hh \ ../mymalloc/mymalloc.h ../mymalloc/mymalloc_svc.cc -rasdl_LDADD = ../reladminif/libreladminif.a ../relmddif/librelmddif.a \ - ../relstorageif/librelstorageif.a ../relindexif/librelindexif.a \ - ../relcatalogif/librelcatalogif.a ../relblobif/librelblobif.a \ - ../indexmgr/libindexmgr.a ../catalogmgr/libcatalogmgr.a \ - ../storagemgr/libstoragemgr.a ../tilemgr/libtilemgr.a \ - ../compression/libcompression.a ../commline/libcommline.a ../raslib/libraslib.a \ - ../conversion/libconversion.a ../rasodmg/librasodmg.a +rasdl_LDADD = ../reladminif/libreladminif.la ../relmddif/librelmddif.la \ + ../relstorageif/librelstorageif.la ../relindexif/librelindexif.la \ + ../relcatalogif/librelcatalogif.la ../relblobif/librelblobif.la \ + ../indexmgr/libindexmgr.la ../catalogmgr/libcatalogmgr.la \ + ../storagemgr/libstoragemgr.la ../tilemgr/libtilemgr.la \ + ../compression/libcompression.la ../commline/libcommline.la ../raslib/libraslib.la \ + ../conversion/libconversion.la ../rasodmg/librasodmg.la rasdl_CPPFLAGS = $(AM_CPPFLAGS) rasdl_CPPFLAGS += $(BASEDB_CPPFLAGS) diff --git a/raslib/Makefile.am b/raslib/Makefile.am index 3094c32..299db85 100644 --- a/raslib/Makefile.am +++ b/raslib/Makefile.am @@ -28,11 +28,11 @@ # ################################################################## -libraslib_a_CPPFLAGS = $(AM_CPPFLAGS) -libraslib_a_CPPFLAGS += $(CLIENT_CPPFLAGS) +libraslib_la_CPPFLAGS = $(AM_CPPFLAGS) +libraslib_la_CPPFLAGS += $(CLIENT_CPPFLAGS) -pkglib_LIBRARIES=libraslib.a -libraslib_a_SOURCES= sinterval.hh dlist.hh point.hh minterval.hh error.hh \ +pkglib_LTLIBRARIES = libraslib.la +libraslib_la_SOURCES= sinterval.hh dlist.hh point.hh minterval.hh error.hh \ rmdebug.hh rminit.hh metaobject.hh type.hh marraytype.hh \ basetype.hh primitivetype.hh sintervaltype.hh \ collectiontype.hh property.hh attribute.hh mintervaltype.hh \ diff --git a/rasmgr/Makefile.am b/rasmgr/Makefile.am index 120d24f..3361f93 100644 --- a/rasmgr/Makefile.am +++ b/rasmgr/Makefile.am @@ -35,7 +35,7 @@ rasmgr_SOURCES=ras_crypto.cc rasmgr_config.cc rasmgr_host.cc rasmgr_main.cc rasm rasmgr.hh rasmgr_protocol.hh rasmgr_master.hh \ ../mymalloc/mymalloc_cln.cc ../mymalloc/mymalloc.h -rasmgr_LDADD= ../raslib/libraslib.a ../network/libnetwork.a ../commline/libcommline.a +rasmgr_LDADD= ../raslib/libraslib.la ../network/libnetwork.la ../commline/libcommline.la SUBDIRS=../network ../commline diff --git a/rasodmg/Makefile.am b/rasodmg/Makefile.am index 1b12d01..6538cc3 100644 --- a/rasodmg/Makefile.am +++ b/rasodmg/Makefile.am @@ -28,12 +28,12 @@ # ################################################################## -pkglib_LIBRARIES=librasodmg.a +pkglib_LTLIBRARIES = librasodmg.la -librasodmg_a_CPPFLAGS = $(AM_CPPFLAGS) -librasodmg_a_CPPFLAGS += $(CLIENT_CPPFLAGS) +librasodmg_la_CPPFLAGS = $(AM_CPPFLAGS) +librasodmg_la_CPPFLAGS += $(CLIENT_CPPFLAGS) -librasodmg_a_SOURCES = collection.cc collection.hh collection.icc \ +librasodmg_la_SOURCES = collection.cc collection.hh collection.icc \ set.cc set.hh \ iterator.cc iterator.hh iterator.icc \ marray.cc marray.hh marray.icc \ diff --git a/reladminif/Makefile.am b/reladminif/Makefile.am index 7f4c907..fdc33b5 100644 --- a/reladminif/Makefile.am +++ b/reladminif/Makefile.am @@ -32,8 +32,8 @@ include $(top_srcdir)/ecpg.mk -pkglib_LIBRARIES=libreladminif.a -libreladminif_a_SOURCES=adminifcommon.cc adminif.hh databaseifcommon.cc databaseif.hh \ +pkglib_LTLIBRARIES = libreladminif.la +libreladminif_la_SOURCES=adminifcommon.cc adminif.hh databaseifcommon.cc databaseif.hh \ transactionifcommon.cc transactionif.hh sqlerror.hh \ oidifcommon.cc oidif.hh dbobject.cc dbobject.hh \ dbnamedobject.cc dbnamedobject.hh eoid.cc eoid.hh \ @@ -41,15 +41,15 @@ libreladminif_a_SOURCES=adminifcommon.cc adminif.hh databaseifcommon.cc database dbobjectiterator.cc dbobjectiterator.hh \ externs.h lists.h binaryrepresentation.hh destroyable.hh \ sqlglobals.h dbobjectiditerator.hh -EXTRA_libreladminif_a_SOURCES=adminif.pgc databaseif.pgc transactionif.pgc \ +EXTRA_libreladminif_la_SOURCES=adminif.pgc databaseif.pgc transactionif.pgc \ sqlerror.pgc oidif.pgc objectbroker.pgc \ dbobjectiditerator.cc -libreladminif_a_LIBADD= adminif.$(OBJEXT) databaseif.$(OBJEXT) transactionif.$(OBJEXT) \ +libreladminif_la_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) \ +libreladminif_la_CPPFLAGS = $(AM_CPPFLAGS) +libreladminif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) +libreladminif_la_DEPENDENCIES= adminif.$(OBJEXT) databaseif.$(OBJEXT) transactionif.$(OBJEXT) \ sqlerror.$(OBJEXT) oidif.$(OBJEXT) objectbroker.$(OBJEXT) diff --git a/relblobif/Makefile.am b/relblobif/Makefile.am index 60d7c3d..f3cc410 100644 --- a/relblobif/Makefile.am +++ b/relblobif/Makefile.am @@ -31,16 +31,16 @@ include $(top_srcdir)/ecpg.mk -pkglib_LIBRARIES=librelblobif.a -librelblobif_a_SOURCES= blobtile.hh \ +pkglib_LTLIBRARIES = librelblobif.la +librelblobif_la_SOURCES= blobtile.hh \ dbtile.cc dbtile.hh inlinetile.cc inlinetile.hh \ blobtilecommon.cc tileid.hh -EXTRA_librelblobif_a_SOURCES=blobtile.pgc -librelblobif_a_LIBADD=blobtile.$(OBJEXT) -librelblobif_a_DEPENDENCIES=blobtile.$(OBJEXT) +EXTRA_librelblobif_la_SOURCES=blobtile.pgc +librelblobif_la_LIBADD=blobtile.$(OBJEXT) +librelblobif_la_DEPENDENCIES=blobtile.$(OBJEXT) -librelblobif_a_CPPFLAGS = $(AM_CPPFLAGS) -librelblobif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) +librelblobif_la_CPPFLAGS = $(AM_CPPFLAGS) +librelblobif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) BUILT_SOURCES=blobtile.@EMBEDDEDSQLOUT@ diff --git a/relcatalogif/Makefile.am b/relcatalogif/Makefile.am index cafbd97..379ebd0 100644 --- a/relcatalogif/Makefile.am +++ b/relcatalogif/Makefile.am @@ -33,8 +33,8 @@ include $(top_srcdir)/ecpg.mk -pkglib_LIBRARIES=librelcatalogif.a -librelcatalogif_a_SOURCES= type.C type.hh basetype.C basetype.hh atomictype.C ulongtype.C ulongtype.hh ushorttype.C ushorttype.hh \ +pkglib_LTLIBRARIES = librelcatalogif.la +librelcatalogif_la_SOURCES= type.C type.hh basetype.C basetype.hh atomictype.C ulongtype.C ulongtype.hh ushorttype.C ushorttype.hh \ booltype.C booltype.hh compositetype.C compositetype.hh structtypecommon.cc structtype.hh structtype.icc \ longtype.C longtype.hh shorttype.C shorttype.hh octettype.C octettype.hh doubletype.C doubletype.hh\ floattype.C floattype.hh chartype.C chartype.hh collectiontype.C collectiontype.hh settypecommon.cc settype.hh\ @@ -42,14 +42,14 @@ librelcatalogif_a_SOURCES= type.C type.hh basetype.C basetype.hh atomictype.C ul mdddimensiontypecommon.cc mdddimensiontype.hh dbminterval.hh inlineminterval.cc inlineminterval.hh \ typeiterator.hh atomictype.hh uintegraltype.hh uintegraltype.icc integraltype.hh \ integraltype.icc realtype.hh realtype.icc alltypes.hh complextype.hh complextype.icc -EXTRA_librelcatalogif_a_SOURCES= settype.pgc mddtype.pgc mddbasetype.pgc mdddomaintype.pgc mdddimensiontype.pgc structtype.pgc dbminterval.pgc -librelcatalogif_a_LIBADD= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJEXT) mdddimensiontype.$(OBJEXT) \ +EXTRA_librelcatalogif_la_SOURCES= settype.pgc mddtype.pgc mddbasetype.pgc mdddomaintype.pgc mdddimensiontype.pgc structtype.pgc dbminterval.pgc +librelcatalogif_la_LIBADD= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJEXT) mdddimensiontype.$(OBJEXT) \ structtype.$(OBJEXT) dbminterval.$(OBJEXT) mdddomaintype.$(OBJEXT) -librelcatalogif_a_DEPENDENCIES= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJEXT) mdddimensiontype.$(OBJEXT) \ +librelcatalogif_la_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) +librelcatalogif_la_CPPFLAGS = $(AM_CPPFLAGS) +librelcatalogif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) BUILT_SOURCES= settype.@EMBEDDEDSQLOUT@ mddtype.@EMBEDDEDSQLOUT@ mddbasetype.@EMBEDDEDSQLOUT@ \ mdddimensiontype.@EMBEDDEDSQLOUT@ structtype.@EMBEDDEDSQLOUT@ dbminterval.@EMBEDDEDSQLOUT@ \ diff --git a/relindexif/Makefile.am b/relindexif/Makefile.am index adb5aaa..403f652 100644 --- a/relindexif/Makefile.am +++ b/relindexif/Makefile.am @@ -28,18 +28,18 @@ include $(top_srcdir)/ecpg.mk -pkglib_LIBRARIES=librelindexif.a -librelindexif_a_SOURCES=dbrcindexdscommon.cc dbrcindexds.hh \ +pkglib_LTLIBRARIES = librelindexif.la +librelindexif_la_SOURCES=dbrcindexdscommon.cc dbrcindexds.hh \ dbtcindexcommon.cc dbtcindex.hh \ hierindexcommon.cc hierindex.hh \ indexid.hh -EXTRA_librelindexif_a_SOURCES=dbrcindexds.pgc dbtcindex.pgc hierindex.pgc +EXTRA_librelindexif_la_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_la_LIBADD=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierindex.$(OBJEXT) +librelindexif_la_DEPENDENCIES=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierindex.$(OBJEXT) -librelindexif_a_CPPFLAGS = $(AM_CPPFLAGS) -librelindexif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) +librelindexif_la_CPPFLAGS = $(AM_CPPFLAGS) +librelindexif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) BUILT_SOURCES=dbrcindexds.@EMBEDDEDSQLOUT@ dbtcindex.@EMBEDDEDSQLOUT@ hierindex.@EMBEDDEDSQLOUT@ diff --git a/relmddif/Makefile.am b/relmddif/Makefile.am index aab618b..c22aa5e 100644 --- a/relmddif/Makefile.am +++ b/relmddif/Makefile.am @@ -31,14 +31,14 @@ include $(top_srcdir)/ecpg.mk -pkglib_LIBRARIES=librelmddif.a -librelmddif_a_SOURCES=dbmddsetcommon.cc dbmddobj.hh dbmddset.hh dbiterid.hh mddid.hh -EXTRA_librelmddif_a_SOURCES= dbmddobj.pgc dbmddset.pgc -librelmddif_a_LIBADD=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT) -librelmddif_a_DEPENDENCIES=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT) +pkglib_LTLIBRARIES = librelmddif.la +librelmddif_la_SOURCES=dbmddsetcommon.cc dbmddobj.hh dbmddset.hh dbiterid.hh mddid.hh +EXTRA_librelmddif_la_SOURCES= dbmddobj.pgc dbmddset.pgc +librelmddif_la_LIBADD=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT) +librelmddif_la_DEPENDENCIES=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT) -librelmddif_a_CPPFLAGS = $(AM_CPPFLAGS) -librelmddif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) +librelmddif_la_CPPFLAGS = $(AM_CPPFLAGS) +librelmddif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) BUILT_SOURCES=dbmddobj.@EMBEDDEDSQLOUT@ dbmddset.@EMBEDDEDSQLOUT@ diff --git a/relstorageif/Makefile.am b/relstorageif/Makefile.am index 653826a..fd2d596 100644 --- a/relstorageif/Makefile.am +++ b/relstorageif/Makefile.am @@ -30,14 +30,14 @@ include $(top_srcdir)/ecpg.mk -pkglib_LIBRARIES=librelstorageif.a -librelstorageif_a_SOURCES= dbstoragelayout.hh storageid.hh empty.cc -EXTRA_librelstorageif_a_SOURCES= dbstoragelayout.pgc -librelstorageif_a_LIBADD= dbstoragelayout.$(OBJEXT) -librelstorageif_a_DEPENDENCIES= dbstoragelayout.$(OBJEXT) +pkglib_LTLIBRARIES = librelstorageif.la +librelstorageif_la_SOURCES= dbstoragelayout.hh storageid.hh empty.cc +EXTRA_librelstorageif_la_SOURCES= dbstoragelayout.pgc +librelstorageif_la_LIBADD= dbstoragelayout.$(OBJEXT) +librelstorageif_la_DEPENDENCIES= dbstoragelayout.$(OBJEXT) -librelstorageif_a_CPPFLAGS = $(AM_CPPFLAGS) -librelstorageif_a_CPPFLAGS += $(BASEDB_CPPFLAGS) +librelstorageif_la_CPPFLAGS = $(AM_CPPFLAGS) +librelstorageif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) BUILT_SOURCES= dbstoragelayout.@EMBEDDEDSQLOUT@ diff --git a/server/Makefile.am b/server/Makefile.am index b79dba7..827335e 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -36,16 +36,16 @@ rasserver_SOURCES=rasserver_main.cc rasserver_config.cc rasserver_entry.cc \ ../debug/debug-clt.hh ../debug/debug.hh ../debug/debug-srv.hh \ ../include/bool.h ../include/globals.hh ../include/rasdaman.hh \ ../include/stdexcept.h -rasserver_LDADD=../servercomm/libservercomm.a ../qlparser/libqlparser.a ../conversion/libconversion.a \ - ../rasodmg/librasodmg.a \ - ../raslib/libraslib.a ../storagemgr/libstoragemgr.a ../reladminif/libreladminif.a \ - ../tilemgr/libtilemgr.a ../mddmgr/libmddmgr.a \ - ../catalogmgr/libcatalogmgr.a ../relmddif/librelmddif.a ../relstorageif/librelstorageif.a \ - ../relcatalogif/librelcatalogif.a ../indexmgr/libindexmgr.a ../relblobif/librelblobif.a \ - ../relindexif/librelindexif.a ../httpserver/libhttpserver.a \ - ../network/libnetwork.a ../commline/libcommline.a \ - ../compression/libcompression.a \ - ../relcatalogif/librelcatalogif.a ../raslib/libraslib.a +rasserver_LDADD=../servercomm/libservercomm.la ../qlparser/libqlparser.la ../conversion/libconversion.la \ + ../rasodmg/librasodmg.la \ + ../raslib/libraslib.la ../storagemgr/libstoragemgr.la ../reladminif/libreladminif.la \ + ../tilemgr/libtilemgr.la ../mddmgr/libmddmgr.la \ + ../catalogmgr/libcatalogmgr.la ../relmddif/librelmddif.la ../relstorageif/librelstorageif.la \ + ../relcatalogif/librelcatalogif.la ../indexmgr/libindexmgr.la ../relblobif/librelblobif.la \ + ../relindexif/librelindexif.la ../httpserver/libhttpserver.la \ + ../network/libnetwork.la ../commline/libcommline.la \ + ../compression/libcompression.la \ + ../relcatalogif/librelcatalogif.la ../raslib/libraslib.la rasserver_CPPFLAGS = $(AM_CPPFLAGS) rasserver_CPPFLAGS += $(BASEDB_CPPFLAGS) diff --git a/servercomm/Makefile.am b/servercomm/Makefile.am index 83c7818..f80e0e7 100644 --- a/servercomm/Makefile.am +++ b/servercomm/Makefile.am @@ -28,11 +28,11 @@ # ################################################################## -pkglib_LIBRARIES=libservercomm.a -nodist_libservercomm_a_SOURCES = ../clientcomm/rpcif_xdr.c -nodist_libservercomm_a_SOURCES += ../clientcomm/rpcif_svc.cc -nodist_libservercomm_a_SOURCES += ../clientcomm/rpcif.h -libservercomm_a_SOURCES=servercomm.cc \ +pkglib_LTLIBRARIES = libservercomm.la +nodist_libservercomm_la_SOURCES = ../clientcomm/rpcif_xdr.c +nodist_libservercomm_la_SOURCES += ../clientcomm/rpcif_svc.cc +nodist_libservercomm_la_SOURCES += ../clientcomm/rpcif.h +libservercomm_la_SOURCES=servercomm.cc \ servercomm2.cc manager.cc callbackmgr.cc httpserver.cc \ ../mymalloc/mymalloc_svc.cc ../mymalloc/mymalloc.h \ callbackmgr.hh httpserver.hh httpserver.icc \ @@ -52,9 +52,9 @@ libservercomm_a_SOURCES=servercomm.cc \ ../rnprotocol/rnpservercomm.cc \ ../rnprotocol/rnpservercomm.hh -libservercomm_a_CPPFLAGS = $(AM_CPPFLAGS) -libservercomm_a_CPPFLAGS += -I$(top_srcdir)/rnprotocol -libservercomm_a_CPPFLAGS += $(BASEDB_CPPFLAGS) +libservercomm_la_CPPFLAGS = $(AM_CPPFLAGS) +libservercomm_la_CPPFLAGS += -I$(top_srcdir)/rnprotocol +libservercomm_la_CPPFLAGS += $(BASEDB_CPPFLAGS) BUILT_SOURCES=../clientcomm/rpcif_xdr.c ../clientcomm/rpcif.h ../clientcomm/rpcif_svc.cc diff --git a/storagemgr/Makefile.am b/storagemgr/Makefile.am index 8c8e8e9..47922a5 100644 --- a/storagemgr/Makefile.am +++ b/storagemgr/Makefile.am @@ -28,8 +28,8 @@ # ################################################################## -pkglib_LIBRARIES = libstoragemgr.a -libstoragemgr_a_SOURCES = sstoragelayout.cc sstoragelayout.hh \ +pkglib_LTLIBRARIES = libstoragemgr.la +libstoragemgr_la_SOURCES = sstoragelayout.cc sstoragelayout.hh \ stgmddconfig.cc stgmddconfig.hh CLEANFILES= core client.bm client.dbg client.log ir.out diff --git a/tilemgr/Makefile.am b/tilemgr/Makefile.am index 8fc5157..fe726f8 100644 --- a/tilemgr/Makefile.am +++ b/tilemgr/Makefile.am @@ -29,5 +29,5 @@ # ################################################################## -pkglib_LIBRARIES = libtilemgr.a -libtilemgr_a_SOURCES = tile.cc tile.hh tile.icc tiler.cc tiler.hh +pkglib_LTLIBRARIES = libtilemgr.la +libtilemgr_la_SOURCES = tile.cc tile.hh tile.icc tiler.cc tiler.hh |