From 99b7fd24c2631f030dab249f89b5a15326459fcb Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sun, 6 Mar 2011 17:35:06 +0100 Subject: nonrecbuild: Make "autoreconf" and "configure" run We still need to adapt the actual make rules and vars so that an actual build might work. --- Makefile-files | 21 ++++----------- Makefile.am | 54 +++++++++++++++++++++++++++++++++++++++ applications/Makefile-files | 32 ----------------------- applications/rasql/Makefile-files | 10 +++----- bin/Makefile-files | 9 ++++--- catalogmgr/Makefile-files | 4 +-- clientcomm/Makefile-files | 7 ++--- commline/Makefile-files | 3 ++- compression/Makefile-files | 3 ++- configure.ac | 4 ++- conversion/Makefile-files | 3 ++- ecpg.mk | 2 +- httpserver/Makefile-files | 5 +++- include/Makefile-files | 1 + indexmgr/Makefile-files | 5 ++-- insertutils/Makefile-files | 10 +++++--- mddmgr/Makefile-files | 3 ++- mymalloc/Makefile-files | 1 + network/Makefile-files | 6 +++-- qlparser/Makefile-files | 16 ++++++------ rascontrol/Makefile-files | 9 ++----- rasdl/Makefile-files | 19 +++++--------- raslib/Makefile-files | 3 ++- rasmgr/Makefile-files | 12 +++------ rasodmg/Makefile-files | 4 +-- reladminif/Makefile-files | 7 +++-- relblobif/Makefile-files | 10 +++----- relcatalogif/Makefile-files | 9 ++++--- relindexif/Makefile-files | 12 +++++---- relmddif/Makefile-files | 9 +++---- relstorageif/Makefile-files | 9 +++---- server/Makefile-files | 11 ++------ servercomm/Makefile-files | 15 ++--------- storagemgr/Makefile-files | 9 ++++--- systemtest/Makefile.am | 3 +-- tilemgr/Makefile-files | 3 ++- 36 files changed, 166 insertions(+), 177 deletions(-) create mode 100644 Makefile.am delete mode 100644 applications/Makefile-files diff --git a/Makefile-files b/Makefile-files index c624c8b..61607f4 100644 --- a/Makefile-files +++ b/Makefile-files @@ -1,4 +1,4 @@ - +# -*-Makefile-*- (for Emacs) # # MAKEFILE FOR: # @@ -30,12 +30,10 @@ # ################################################################## -ACLOCAL_AMFLAGS = -I m4 - -nobase_pkginclude_HEADERS = include $(srcdir)/header-files.mk -dist-hook: +DIST_HOOKS += dist-hook-header-files +dist-hook-header-files: (echo "# DO NOT MODIFY THIS FILE"; \ echo "# This file was autogenerated by the dist-hook target"; \ cd "$(srcdir)"; \ @@ -55,15 +53,6 @@ dist-hook: mv -f "header-files.mk.new" "$(srcdir)/header-files.mk"; \ fi -SUBDIRS = relblobif relindexif relmddif relcatalogif reladminif relstorageif \ - indexmgr catalogmgr tilemgr storagemgr compression commline network \ - raslib clientcomm servercomm rasodmg qlparser conversion \ - mddmgr httpserver mymalloc server rasmgr rascontrol rasdl \ - applications bin insertutils manuals_and_examples include \ - systemtest - -# excluded for the moment, contains nothing that is delivered: -# exportutils - -install-exec-hook: +INSTALL_EXEC_HOOKS += install-exec-hook-logdir +install-exec-hook-logdir: $(INSTALL) -m 0755 -d "$(DESTDIR)$(logdir)" diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..3f09d65 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,54 @@ +ACLOCAL_AMFLAGS = -I m4 + +SUBDIRS = . systemtest manuals_and_examples + +# Our hook variables +DIST_HOOKS = +INSTALL_EXEC_HOOKS = + +# Automake variables to be appended +BUILT_SOURCES = +CLEANFILES = +EXTRA_DIST = +SUFFIXES = +bin_PROGRAMS = +nobase_pkginclude_HEADERS = +pkglib_LTLIBRARIES = +rdmexecbin_SCRIPTS = + +include ecpg.mk + +include Makefile-files +include applications/rasql/Makefile-files +include bin/Makefile-files +include catalogmgr/Makefile-files +include clientcomm/Makefile-files +include commline/Makefile-files +include compression/Makefile-files +include conversion/Makefile-files +include httpserver/Makefile-files +include include/Makefile-files +include indexmgr/Makefile-files +include insertutils/Makefile-files +include mddmgr/Makefile-files +include mymalloc/Makefile-files +include network/Makefile-files +include qlparser/Makefile-files +include rascontrol/Makefile-files +include rasdl/Makefile-files +include raslib/Makefile-files +include rasmgr/Makefile-files +include rasodmg/Makefile-files +include reladminif/Makefile-files +include relblobif/Makefile-files +include relcatalogif/Makefile-files +include relindexif/Makefile-files +include relmddif/Makefile-files +include relstorageif/Makefile-files +include servercomm/Makefile-files +include server/Makefile-files +include storagemgr/Makefile-files +include tilemgr/Makefile-files + +dist-hook: $(DIST_HOOKS) +install-exec-hook: $(INSTALL_EXEC_HOOKS) diff --git a/applications/Makefile-files b/applications/Makefile-files deleted file mode 100644 index 831ab57..0000000 --- a/applications/Makefile-files +++ /dev/null @@ -1,32 +0,0 @@ -# -*-Makefile-*- -# This file is part of rasdaman community. -# -# Rasdaman community is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Rasdaman community is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with rasdaman community. If not, see . -# -# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Peter Baumann / -# rasdaman GmbH. -# -# For more information please see -# or contact Peter Baumann via . -# -# MAKEFILE FOR: -# rasdaman applications -# does nothing but distribute any make call into all subdirs -# -# COMMENTS: -# -################################################################## - -SUBDIRS=rasql -# should also contain rview and directql diff --git a/applications/rasql/Makefile-files b/applications/rasql/Makefile-files index d7b0c34..8d1143a 100644 --- a/applications/rasql/Makefile-files +++ b/applications/rasql/Makefile-files @@ -1,4 +1,5 @@ # -*-Makefile-*- +# # This file is part of rasdaman community. # # Rasdaman community is free software: you can redistribute it and/or modify @@ -28,7 +29,8 @@ # ################################################################## -bin_PROGRAMS=rasql +bin_PROGRAMS += rasql + rasql_SOURCES= rasql.cc rasql_error.cc rasql_error.hh \ rasql_signal.cc rasql_signal.hh rasql_CPPFLAGS = $(AM_CPPFLAGS) @@ -39,12 +41,6 @@ rasql_LDADD = ../../rasodmg/librasodmg.la ../../clientcomm/libclientcomm.la \ ../../network/libnetwork.la rasql_LDADD += $(CLIENT_LIBS) -SUBDIRS= ../../rasodmg ../../clientcomm ../../compression \ - ../../raslib ../../conversion ../../commline ../../network - -$(RECURSIVE_CLEAN_TARGETS): - @$(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed s/-recursive/-am/` - #rasql: rasql.o rasql_error.o rasql_signal.cc # $(LIBS) # $(PURIFY) $(CXX) $(LDFLAGS) -o rasql $^ $(LIBS) $(IMGLIBS) -lm diff --git a/bin/Makefile-files b/bin/Makefile-files index 348a4b2..1113669 100644 --- a/bin/Makefile-files +++ b/bin/Makefile-files @@ -1,3 +1,4 @@ +# -*-Makefile-*- (for Emacs) # # This file is part of rasdaman community. # @@ -22,9 +23,11 @@ # ################################################################### -rdmexecbin_SCRIPTS = start_rasdaman.sh stop_rasdaman.sh create_db.sh -EXTRA_DIST = stop_rasdaman.sh.in start_rasdaman.sh.in create_db.sh.in rasmgr.conf.in -CLEANFILES = start_rasdaman.sh stop_rasdaman.sh create_db.sh rasmgr.conf +rdmexecbin_SCRIPTS += start_rasdaman.sh stop_rasdaman.sh create_db.sh + +EXTRA_DIST += stop_rasdaman.sh.in start_rasdaman.sh.in create_db.sh.in rasmgr.conf.in +CLEANFILES += start_rasdaman.sh stop_rasdaman.sh create_db.sh rasmgr.conf + dist_sysconf_DATA=rasmgr.conf dist_pkgdata_DATA=errtxts_en errtxts_de errtxts_fr errtxts diff --git a/catalogmgr/Makefile-files b/catalogmgr/Makefile-files index f774bf3..a65057f 100644 --- a/catalogmgr/Makefile-files +++ b/catalogmgr/Makefile-files @@ -28,8 +28,8 @@ ################################################################## -# object files to put in library -pkglib_LTLIBRARIES = libcatalogmgr.la +pkglib_LTLIBRARIES += libcatalogmgr.la + libcatalogmgr_la_SOURCES=ops.cc typefactory.cc algebraops.cc ops.hh \ typefactory.hh algebraops.hh autogen_ops.hh diff --git a/clientcomm/Makefile-files b/clientcomm/Makefile-files index c2e6f43..322d62e 100644 --- a/clientcomm/Makefile-files +++ b/clientcomm/Makefile-files @@ -29,7 +29,8 @@ # ################################################################## -pkglib_LTLIBRARIES = libclientcomm.la +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 \ @@ -50,10 +51,6 @@ libclientcomm_la_CPPFLAGS += $(CLIENT_CPPFLAGS) EXTRA_libclientcomm_la_SOURCES = rpcif.x -BUILT_SOURCES = -CLEANFILES = -EXTRA_DIST = - BUILT_SOURCES += rpcif.h CLEANFILES += rpcif.h rpcif.h.tmp rpcif.h.tmp2 EXTRA_DIST += rpcif.h.awk diff --git a/commline/Makefile-files b/commline/Makefile-files index f29162a..5a1ad45 100644 --- a/commline/Makefile-files +++ b/commline/Makefile-files @@ -27,5 +27,6 @@ # ################################################################## -pkglib_LTLIBRARIES = libcommline.la +pkglib_LTLIBRARIES += libcommline.la + libcommline_la_SOURCES=cmlparser.cc cmlparser.hh diff --git a/compression/Makefile-files b/compression/Makefile-files index 42186f6..833667f 100644 --- a/compression/Makefile-files +++ b/compression/Makefile-files @@ -28,7 +28,8 @@ # ################################################################## -pkglib_LTLIBRARIES = libcompression.la +pkglib_LTLIBRARIES += libcompression.la + libcompression_la_SOURCES=tilecompression.cc tilecompression.hh tilecompnone.cc tilecompnone.hh libcompression_la_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/configure.ac b/configure.ac index b299fd4..29e9cec 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ AM_INIT_AUTOMAKE([ foreign no-dist-gzip dist-xz +subdir-objects ]) # Save original CFLAGS, CPPFLAGS, CXXFLAGS values. @@ -59,7 +60,8 @@ dnl we prefer java AC_PROG_JAVA_CC AC_CHECK_PROGS([JAR_TOOL], [jar], [${am_missing_run} jar]) dnl we need bison not yacc -AC_CHECK_PROGS(YACC, bison, [${am_missing_run} bison]) +AC_ARG_VAR([YACC], [bison executable (we need bison, not yacc)]) +AC_PATH_PROG([YACC], [bison], [${am_missing_run} bison]) # Find/use given doxygen executable AC_ARG_VAR([DOXYGEN], [doxygen executable to build docs with]) diff --git a/conversion/Makefile-files b/conversion/Makefile-files index 5b73919..f5f3db0 100644 --- a/conversion/Makefile-files +++ b/conversion/Makefile-files @@ -29,7 +29,8 @@ # ################################################################## -pkglib_LTLIBRARIES = libconversion.la +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 \ diff --git a/ecpg.mk b/ecpg.mk index 3e6ead7..6de4f10 100644 --- a/ecpg.mk +++ b/ecpg.mk @@ -1,7 +1,7 @@ # -*- Makefile -*- # ecpg.mk -SUFFIXES = .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@ +SUFFIXES += .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@ .@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@: set -x; cwd="$$PWD"; \ diff --git a/httpserver/Makefile-files b/httpserver/Makefile-files index 056f9c4..7da70a3 100644 --- a/httpserver/Makefile-files +++ b/httpserver/Makefile-files @@ -1,3 +1,5 @@ +# -*-Makefile-*- (for Emacs) +# # This file is part of rasdaman community. # # Rasdaman community is free software: you can redistribute it and/or modify @@ -24,7 +26,8 @@ # ################################################################## -pkglib_LTLIBRARIES = libhttpserver.la +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 \ diff --git a/include/Makefile-files b/include/Makefile-files index 7dcd344..c28ec62 100644 --- a/include/Makefile-files +++ b/include/Makefile-files @@ -1,3 +1,4 @@ +# -*-Makefile-*- (for Emacs) # # This file is part of rasdaman community. # diff --git a/indexmgr/Makefile-files b/indexmgr/Makefile-files index 4e30000..4e0dab0 100644 --- a/indexmgr/Makefile-files +++ b/indexmgr/Makefile-files @@ -29,10 +29,11 @@ # ################################################################## -pkglib_LTLIBRARIES = libindexmgr.la +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 -CLEANFILES=core +CLEANFILES += core diff --git a/insertutils/Makefile-files b/insertutils/Makefile-files index 4e720ac..1378c94 100644 --- a/insertutils/Makefile-files +++ b/insertutils/Makefile-files @@ -29,8 +29,10 @@ # ################################################################## -bin_PROGRAMS = insertppm -rdmexecbin_SCRIPTS = insertdemo.sh +bin_PROGRAMS += insertppm + +rdmexecbin_SCRIPTS += insertdemo.sh + insertppm_SOURCES=insertppm.cc ../mymalloc/mymalloc_cln.cc insertppm_LDADD=../rasodmg/librasodmg.la ../clientcomm/libclientcomm.la \ ../compression/libcompression.la ../conversion/libconversion.la \ @@ -41,8 +43,8 @@ insertppm_CPPFLAGS = $(AM_CPPFLAGS) insertppm_CPPFLAGS += $(COMM_CPPFLAGS) insertppm_LDADD += $(COMM_LIBS) -CLEANFILES = insertdemo.sh -EXTRA_DIST = insertdemo.sh.in +CLEANFILES += insertdemo.sh +EXTRA_DIST += insertdemo.sh.in insertdemo.sh: insertdemo.sh.in Makefile rm -f insertdemo.sh diff --git a/mddmgr/Makefile-files b/mddmgr/Makefile-files index 62cfcbf..6857c9b 100644 --- a/mddmgr/Makefile-files +++ b/mddmgr/Makefile-files @@ -28,7 +28,8 @@ # ################################################################## -pkglib_LTLIBRARIES = libmddmgr.la +pkglib_LTLIBRARIES += libmddmgr.la + libmddmgr_la_CPPFLAGS = $(AM_CPPFLAGS) libmddmgr_la_CPPFLAGS += $(BASEDB_CPPFLAGS) libmddmgr_la_SOURCES= mddobj.cc mddobj.hh \ diff --git a/mymalloc/Makefile-files b/mymalloc/Makefile-files index 0709bfd..fb1ae5e 100644 --- a/mymalloc/Makefile-files +++ b/mymalloc/Makefile-files @@ -1,3 +1,4 @@ +# -*-Makefile-*- (for Emacs) # # This file is part of rasdaman community. # diff --git a/network/Makefile-files b/network/Makefile-files index 78f9f72..5055fca 100644 --- a/network/Makefile-files +++ b/network/Makefile-files @@ -1,3 +1,4 @@ +# -*-Makefile-*- (for Emacs) # # This file is part of rasdaman community. # @@ -28,7 +29,8 @@ # ################################################################## -pkglib_LTLIBRARIES = libnetwork.la +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 \ @@ -40,4 +42,4 @@ libnetwork_la_SOURCES= akgnet_commbuffer.cc akgnet_commbuffer.hh \ akgnetwork.hh akgnet_common.hh -CLEANFILES=core +CLEANFILES += core diff --git a/qlparser/Makefile-files b/qlparser/Makefile-files index b217a88..d89fac0 100644 --- a/qlparser/Makefile-files +++ b/qlparser/Makefile-files @@ -30,15 +30,15 @@ # ################################################################## -pkglib_LTLIBRARIES = libqlparser.la +pkglib_LTLIBRARIES += libqlparser.la + +# -d generates token definitions in .h file +libqlparser_la_YFLAGS = -d -y # -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 -AM_LFLAGS=-i -I +libqlparser_la_LFLAGS = -i -I -YACC = bison -# -d generates token definitions in .h file -AM_YFLAGS=-d -y libqlparser_la_CPPFLAGS = $(AM_CPPFLAGS) libqlparser_la_CPPFLAGS += $(BASEDB_CPPFLAGS) libqlparser_la_SOURCES=oql.yy lex.ll alloca.c\ @@ -90,7 +90,7 @@ libqlparser_la_SOURCES=oql.yy lex.ll alloca.c\ qtmddconfig.hh qtmddconfig.cc \ qtmddcfgop.hh qtmddcfgop.cc -EXTRA_libqlparser_la_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 +# BUILT_SOURCES += lex.cc oql.cc oql.h +# CLEANFILES += lex.cc oql.cc oql.h diff --git a/rascontrol/Makefile-files b/rascontrol/Makefile-files index 7c416dc..23f094e 100644 --- a/rascontrol/Makefile-files +++ b/rascontrol/Makefile-files @@ -1,3 +1,4 @@ +# -*-Makefile-*- (for Emacs) # # This file is part of rasdaman community. # @@ -32,7 +33,7 @@ CRYPTO=../rasmgr/ras_crypto.o SRCCXX=rascontrol.cc rasmgr_utils_comm.cc rasmgrtest.cc raspasswd.cc \ rascontrol_class.cc rasmgr_tester.cc rasmgr_utils_conf.cc rasmgrtester_conf.cc -bin_PROGRAMS=rascontrol raspasswd +bin_PROGRAMS += rascontrol raspasswd rascontrol_SOURCES=rascontrol.cc rascontrol_class.cc rascontrol.hh \ ../rasmgr/ras_crypto.cc ../rasmgr/ras_crypto.hh \ @@ -45,9 +46,3 @@ raspasswd_SOURCES=raspasswd.cc raspasswd.hh \ rasmgr_utils_comm.cc rasmgr_utils_comm.hh \ rasmgr_utils_conf.cc rasmgr_utils_conf.hh raspasswd_LDADD = ../network/libnetwork.la ../commline/libcommline.la - -SUBDIRS=../network ../commline - -$(RECURSIVE_CLEAN_TARGETS): - @$(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed s/-recursive/-am/` - diff --git a/rasdl/Makefile-files b/rasdl/Makefile-files index fbb3620..1220a2e 100644 --- a/rasdl/Makefile-files +++ b/rasdl/Makefile-files @@ -29,11 +29,11 @@ # ################################################################## -AM_LFLAGS=-I -YACC = bison -AM_YFLAGS=-d -y +rasdl_LFLAGS = -I +rasdl_YFLAGS = -d -y + +bin_PROGRAMS += rasdl -bin_PROGRAMS=rasdl 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 \ @@ -50,15 +50,8 @@ 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 - -SUBDIRS=../reladminif ../relmddif ../relstorageif ../relindexif ../relcatalogif \ - ../relblobif ../indexmgr ../catalogmgr ../storagemgr ../tilemgr \ - ../compression ../raslib ../conversion ../commline ../rasodmg - -$(RECURSIVE_CLEAN_TARGETS): - @$(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed s/-recursive/-am/` +# BUILT_SOURCES=lex.cc odl.cc odl.h +# CLEANFILES=lex.cc odl.cc odl.h #.PHONY : doc #doc: diff --git a/raslib/Makefile-files b/raslib/Makefile-files index 299db85..391019d 100644 --- a/raslib/Makefile-files +++ b/raslib/Makefile-files @@ -31,7 +31,8 @@ libraslib_la_CPPFLAGS = $(AM_CPPFLAGS) libraslib_la_CPPFLAGS += $(CLIENT_CPPFLAGS) -pkglib_LTLIBRARIES = libraslib.la +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 \ diff --git a/rasmgr/Makefile-files b/rasmgr/Makefile-files index 3361f93..d6db88d 100644 --- a/rasmgr/Makefile-files +++ b/rasmgr/Makefile-files @@ -1,3 +1,4 @@ +# -*-Makefile-*- (for Emacs) # # This file is part of rasdaman community. # @@ -24,7 +25,9 @@ # * # * COMMENTS: ########################################################################## -bin_PROGRAMS=rasmgr + +bin_PROGRAMS += rasmgr + rasmgr_SOURCES=ras_crypto.cc rasmgr_config.cc rasmgr_host.cc rasmgr_main.cc rasmgr_rascontrol.cc rasmgr_srv.cc \ rasmgr_comm.cc rasmgr_dbm.cc rasmgr_master_nb.cc rasmgr_rascontrol_help.cc \ rasmgr_users.cc rasmgr_comm_nb.cc rasmgr_error.cc rasmgr_localsrv.cc rasmgr_random.cc \ @@ -37,13 +40,6 @@ rasmgr_SOURCES=ras_crypto.cc rasmgr_config.cc rasmgr_host.cc rasmgr_main.cc rasm rasmgr_LDADD= ../raslib/libraslib.la ../network/libnetwork.la ../commline/libcommline.la -SUBDIRS=../network ../commline - -$(RECURSIVE_CLEAN_TARGETS): - @$(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed s/-recursive/-am/` - - - #ifdef STATIC_LIBS # EXTRASTATICLIBS= -Xlinker -Bstatic -nodefaultlibs -lstdc++ diff --git a/rasodmg/Makefile-files b/rasodmg/Makefile-files index 6538cc3..f54c365 100644 --- a/rasodmg/Makefile-files +++ b/rasodmg/Makefile-files @@ -28,7 +28,7 @@ # ################################################################## -pkglib_LTLIBRARIES = librasodmg.la +pkglib_LTLIBRARIES += librasodmg.la librasodmg_la_CPPFLAGS = $(AM_CPPFLAGS) librasodmg_la_CPPFLAGS += $(CLIENT_CPPFLAGS) @@ -54,5 +54,5 @@ librasodmg_la_SOURCES = collection.cc collection.hh collection.icc \ polygon.cc polygon.hh \ polycutout.cc polycutout.hh -CLEANFILES = core +CLEANFILES += core diff --git a/reladminif/Makefile-files b/reladminif/Makefile-files index fdc33b5..b09e1ff 100644 --- a/reladminif/Makefile-files +++ b/reladminif/Makefile-files @@ -30,9 +30,8 @@ # ################################################################## -include $(top_srcdir)/ecpg.mk +pkglib_LTLIBRARIES += libreladminif.la -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 \ @@ -53,11 +52,11 @@ libreladminif_la_DEPENDENCIES= adminif.$(OBJEXT) databaseif.$(OBJEXT) transactio sqlerror.$(OBJEXT) oidif.$(OBJEXT) objectbroker.$(OBJEXT) -BUILT_SOURCES= adminif.@EMBEDDEDSQLOUT@ databaseif.@EMBEDDEDSQLOUT@ transactionif.@EMBEDDEDSQLOUT@ \ +BUILT_SOURCES += adminif.@EMBEDDEDSQLOUT@ databaseif.@EMBEDDEDSQLOUT@ transactionif.@EMBEDDEDSQLOUT@ \ sqlerror.@EMBEDDEDSQLOUT@ oidif.@EMBEDDEDSQLOUT@ objectbroker.@EMBEDDEDSQLOUT@ -CLEANFILES= adminif.@EMBEDDEDSQLOUT@ databaseif.@EMBEDDEDSQLOUT@ transactionif.@EMBEDDEDSQLOUT@ \ +CLEANFILES += adminif.@EMBEDDEDSQLOUT@ databaseif.@EMBEDDEDSQLOUT@ transactionif.@EMBEDDEDSQLOUT@ \ sqlerror.@EMBEDDEDSQLOUT@ oidif.@EMBEDDEDSQLOUT@ objectbroker.@EMBEDDEDSQLOUT@ \ client.bm client.dbg client.log ir.out diff --git a/relblobif/Makefile-files b/relblobif/Makefile-files index f3cc410..2ff1127 100644 --- a/relblobif/Makefile-files +++ b/relblobif/Makefile-files @@ -29,9 +29,8 @@ # ################################################################## -include $(top_srcdir)/ecpg.mk +pkglib_LTLIBRARIES += librelblobif.la -pkglib_LTLIBRARIES = librelblobif.la librelblobif_la_SOURCES= blobtile.hh \ dbtile.cc dbtile.hh inlinetile.cc inlinetile.hh \ blobtilecommon.cc tileid.hh @@ -42,8 +41,7 @@ librelblobif_la_DEPENDENCIES=blobtile.$(OBJEXT) librelblobif_la_CPPFLAGS = $(AM_CPPFLAGS) librelblobif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) -BUILT_SOURCES=blobtile.@EMBEDDEDSQLOUT@ +BUILT_SOURCES += blobtile.@EMBEDDEDSQLOUT@ -CLEANFILES=blobtile.@EMBEDDEDSQLOUT@ client.bm client.dbg client.log ir.out \ - blobtile.$(OBJEXT) - +CLEANFILES += blobtile.@EMBEDDEDSQLOUT@ blobtile.$(OBJEXT) +CLEANFILES += client.bm client.dbg client.log ir.out diff --git a/relcatalogif/Makefile-files b/relcatalogif/Makefile-files index 379ebd0..2f21c76 100644 --- a/relcatalogif/Makefile-files +++ b/relcatalogif/Makefile-files @@ -31,9 +31,8 @@ # This Makefile only works with GNU Make! # -include $(top_srcdir)/ecpg.mk +pkglib_LTLIBRARIES += librelcatalogif.la -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\ @@ -51,12 +50,14 @@ librelcatalogif_la_DEPENDENCIES= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype librelcatalogif_la_CPPFLAGS = $(AM_CPPFLAGS) librelcatalogif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) -BUILT_SOURCES= settype.@EMBEDDEDSQLOUT@ mddtype.@EMBEDDEDSQLOUT@ mddbasetype.@EMBEDDEDSQLOUT@ \ +BUILT_SOURCES += \ + settype.@EMBEDDEDSQLOUT@ mddtype.@EMBEDDEDSQLOUT@ mddbasetype.@EMBEDDEDSQLOUT@ \ mdddimensiontype.@EMBEDDEDSQLOUT@ structtype.@EMBEDDEDSQLOUT@ dbminterval.@EMBEDDEDSQLOUT@ \ mdddomaintype.@EMBEDDEDSQLOUT@ -CLEANFILES=settype.@EMBEDDEDSQLOUT@ mddtype.@EMBEDDEDSQLOUT@ mddbasetype.@EMBEDDEDSQLOUT@ \ +CLEANFILES += \ + settype.@EMBEDDEDSQLOUT@ mddtype.@EMBEDDEDSQLOUT@ mddbasetype.@EMBEDDEDSQLOUT@ \ mdddimensiontype.@EMBEDDEDSQLOUT@ structtype.@EMBEDDEDSQLOUT@ dbminterval.@EMBEDDEDSQLOUT@ \ mdddomaintype.@EMBEDDEDSQLOUT@ \ client.bm client.dbg client.log ir.out core diff --git a/relindexif/Makefile-files b/relindexif/Makefile-files index 403f652..ed625c4 100644 --- a/relindexif/Makefile-files +++ b/relindexif/Makefile-files @@ -26,9 +26,8 @@ # ################################################################## -include $(top_srcdir)/ecpg.mk +pkglib_LTLIBRARIES += librelindexif.la -pkglib_LTLIBRARIES = librelindexif.la librelindexif_la_SOURCES=dbrcindexdscommon.cc dbrcindexds.hh \ dbtcindexcommon.cc dbtcindex.hh \ hierindexcommon.cc hierindex.hh \ @@ -41,7 +40,10 @@ librelindexif_la_DEPENDENCIES=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierinde librelindexif_la_CPPFLAGS = $(AM_CPPFLAGS) librelindexif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) -BUILT_SOURCES=dbrcindexds.@EMBEDDEDSQLOUT@ dbtcindex.@EMBEDDEDSQLOUT@ hierindex.@EMBEDDEDSQLOUT@ - -CLEANFILES=dbrcindexds.@EMBEDDEDSQLOUT@ dbtcindex.@EMBEDDEDSQLOUT@ hierindex.@EMBEDDEDSQLOUT@ +BUILT_SOURCES += dbrcindexds.@EMBEDDEDSQLOUT@ +BUILT_SOURCES += dbtcindex.@EMBEDDEDSQLOUT@ +BUILT_SOURCES += hierindex.@EMBEDDEDSQLOUT@ +CLEANFILES += dbrcindexds.@EMBEDDEDSQLOUT@ +CLEANFILES += dbtcindex.@EMBEDDEDSQLOUT@ +CLEANFILES += hierindex.@EMBEDDEDSQLOUT@ diff --git a/relmddif/Makefile-files b/relmddif/Makefile-files index c22aa5e..2fa61e6 100644 --- a/relmddif/Makefile-files +++ b/relmddif/Makefile-files @@ -29,9 +29,8 @@ # ################################################################## -include $(top_srcdir)/ecpg.mk +pkglib_LTLIBRARIES += librelmddif.la -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) @@ -40,8 +39,8 @@ librelmddif_la_DEPENDENCIES=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT) librelmddif_la_CPPFLAGS = $(AM_CPPFLAGS) librelmddif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) -BUILT_SOURCES=dbmddobj.@EMBEDDEDSQLOUT@ dbmddset.@EMBEDDEDSQLOUT@ +BUILT_SOURCES += dbmddobj.@EMBEDDEDSQLOUT@ dbmddset.@EMBEDDEDSQLOUT@ -CLEANFILES=dbmddobj.@EMBEDDEDSQLOUT@ dbmddset.@EMBEDDEDSQLOUT@ \ - client.bm client.dbg client.log ir.out core +CLEANFILES += dbmddobj.@EMBEDDEDSQLOUT@ dbmddset.@EMBEDDEDSQLOUT@ +CLEANFILES += client.bm client.dbg client.log ir.out core diff --git a/relstorageif/Makefile-files b/relstorageif/Makefile-files index fd2d596..f69a179 100644 --- a/relstorageif/Makefile-files +++ b/relstorageif/Makefile-files @@ -28,9 +28,8 @@ # ################################################################## -include $(top_srcdir)/ecpg.mk +pkglib_LTLIBRARIES += librelstorageif.la -pkglib_LTLIBRARIES = librelstorageif.la librelstorageif_la_SOURCES= dbstoragelayout.hh storageid.hh empty.cc EXTRA_librelstorageif_la_SOURCES= dbstoragelayout.pgc librelstorageif_la_LIBADD= dbstoragelayout.$(OBJEXT) @@ -39,9 +38,9 @@ librelstorageif_la_DEPENDENCIES= dbstoragelayout.$(OBJEXT) librelstorageif_la_CPPFLAGS = $(AM_CPPFLAGS) librelstorageif_la_CPPFLAGS += $(BASEDB_CPPFLAGS) -BUILT_SOURCES= dbstoragelayout.@EMBEDDEDSQLOUT@ +BUILT_SOURCES += dbstoragelayout.@EMBEDDEDSQLOUT@ -CLEANFILES= dbstoragelayout.@EMBEDDEDSQLOUT@ \ - client.bm client.dbg client.log ir.out +CLEANFILES += dbstoragelayout.@EMBEDDEDSQLOUT@ +CLEANFILES += client.bm client.dbg client.log ir.out diff --git a/server/Makefile-files b/server/Makefile-files index 827335e..5df6d48 100644 --- a/server/Makefile-files +++ b/server/Makefile-files @@ -29,7 +29,8 @@ # ################################################################## -bin_PROGRAMS=rasserver +bin_PROGRAMS += rasserver + rasserver_SOURCES=rasserver_main.cc rasserver_config.cc rasserver_entry.cc \ createinitmdd.cc rasserver_config.hh rasserver_entry.hh \ createinitmdd.hh template_inst.hh\ @@ -50,11 +51,3 @@ rasserver_LDADD=../servercomm/libservercomm.la ../qlparser/libqlparser.la ../con 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 \ - ../mddmgr ../httpserver ../mymalloc - -$(RECURSIVE_CLEAN_TARGETS): - @$(MAKE) $(AM_MAKEFLAGS) `echo $@ | sed s/-recursive/-am/` diff --git a/servercomm/Makefile-files b/servercomm/Makefile-files index f80e0e7..b1a4bac 100644 --- a/servercomm/Makefile-files +++ b/servercomm/Makefile-files @@ -28,7 +28,8 @@ # ################################################################## -pkglib_LTLIBRARIES = libservercomm.la +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 @@ -55,15 +56,3 @@ libservercomm_la_SOURCES=servercomm.cc \ 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 - -.PHONY: ../clientcomm/rpcif_xdr.c ../clientcomm/rpcif.h ../clientcomm/rpcif_svc.cc -../clientcomm/rpcif_xdr.c: - cd ../clientcomm && $(MAKE) $(AM_MAKEFLAGS) rpcif_xdr.c - -../clientcomm/rpcif.h: - cd ../clientcomm && $(MAKE) $(AM_MAKEFLAGS) rpcif.h - -../clientcomm/rpcif_svc.cc: - cd ../clientcomm && $(MAKE) $(AM_MAKEFLAGS) rpcif_svc.cc diff --git a/storagemgr/Makefile-files b/storagemgr/Makefile-files index 47922a5..705b25d 100644 --- a/storagemgr/Makefile-files +++ b/storagemgr/Makefile-files @@ -28,9 +28,10 @@ # ################################################################## -pkglib_LTLIBRARIES = libstoragemgr.la -libstoragemgr_la_SOURCES = sstoragelayout.cc sstoragelayout.hh \ - stgmddconfig.cc stgmddconfig.hh +pkglib_LTLIBRARIES += libstoragemgr.la -CLEANFILES= core client.bm client.dbg client.log ir.out +libstoragemgr_la_SOURCES = sstoragelayout.cc sstoragelayout.hh +libstoragemgr_la_SOURCES += stgmddconfig.cc stgmddconfig.hh + +CLEANFILES += core client.bm client.dbg client.log ir.out diff --git a/systemtest/Makefile.am b/systemtest/Makefile.am index 8e9047d..f4fecb2 100644 --- a/systemtest/Makefile.am +++ b/systemtest/Makefile.am @@ -40,8 +40,7 @@ TESTSEQUENCE += testcases_open/* TESTSEQUENCE += testcases_fixed/* # general system test -.PHONY: check -check: +check-local: for testcase in ${TESTSEQUENCE}; do\ PATH=${bindir}:${PATH} $$testcase/test.sh; \ if [ $$? -ne 0 ]; \ diff --git a/tilemgr/Makefile-files b/tilemgr/Makefile-files index fe726f8..42b44ed 100644 --- a/tilemgr/Makefile-files +++ b/tilemgr/Makefile-files @@ -29,5 +29,6 @@ # ################################################################## -pkglib_LTLIBRARIES = libtilemgr.la +pkglib_LTLIBRARIES += libtilemgr.la + libtilemgr_la_SOURCES = tile.cc tile.hh tile.icc tiler.cc tiler.hh -- cgit