summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2011-03-06 18:16:24 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2011-03-07 20:57:51 +0100
commit6a6e7ac13cc911aa80d11ca76a569d2898c4552b (patch)
tree93e26cf61369b4faae920e5b78787bb25c301059
parenta1779000cf8bab010f384760cd716caea89a0aa3 (diff)
downloadrasdaman-upstream-6a6e7ac13cc911aa80d11ca76a569d2898c4552b.tar.gz
rasdaman-upstream-6a6e7ac13cc911aa80d11ca76a569d2898c4552b.tar.xz
rasdaman-upstream-6a6e7ac13cc911aa80d11ca76a569d2898c4552b.zip
nonrecbuild: Make BUILT_SOURCES stage build
-rw-r--r--ecpg.mk4
-rw-r--r--reladminif/Makefile-files20
-rw-r--r--relblobif/Makefile-files7
-rw-r--r--relcatalogif/Makefile-files26
-rw-r--r--relindexif/Makefile-files17
-rw-r--r--relmddif/Makefile-files11
-rw-r--r--relstorageif/Makefile-files8
7 files changed, 58 insertions, 35 deletions
diff --git a/ecpg.mk b/ecpg.mk
index 6de4f10..c065683 100644
--- a/ecpg.mk
+++ b/ecpg.mk
@@ -4,5 +4,5 @@
SUFFIXES += .@EMBEDDEDSQLEXT@ .@EMBEDDEDSQLOUT@
.@EMBEDDEDSQLEXT@.@EMBEDDEDSQLOUT@:
- set -x; cwd="$$PWD"; \
- cd "$$(dirname "$<")" && $(EMBEDDEDSQLPRECOMPILER) -o "$$cwd/$@" "$$(basename "$<")"
+ $(MKDIR_P) "$$(dirname "$@")"
+ cwd="$$PWD"; cd "$$(dirname "$<")" && $(EMBEDDEDSQLPRECOMPILER) -o "$$cwd/$@" "$$(basename "$<")"
diff --git a/reladminif/Makefile-files b/reladminif/Makefile-files
index b09e1ff..93f3216 100644
--- a/reladminif/Makefile-files
+++ b/reladminif/Makefile-files
@@ -51,13 +51,19 @@ libreladminif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
libreladminif_la_DEPENDENCIES= adminif.$(OBJEXT) databaseif.$(OBJEXT) transactionif.$(OBJEXT) \
sqlerror.$(OBJEXT) oidif.$(OBJEXT) objectbroker.$(OBJEXT)
+BUILT_SOURCES += reladminif/adminif.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += reladminif/databaseif.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += reladminif/transactionif.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += reladminif/sqlerror.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += reladminif/oidif.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += reladminif/objectbroker.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += adminif.@EMBEDDEDSQLOUT@ databaseif.@EMBEDDEDSQLOUT@ transactionif.@EMBEDDEDSQLOUT@ \
- sqlerror.@EMBEDDEDSQLOUT@ oidif.@EMBEDDEDSQLOUT@ objectbroker.@EMBEDDEDSQLOUT@
-
-
-CLEANFILES += adminif.@EMBEDDEDSQLOUT@ databaseif.@EMBEDDEDSQLOUT@ transactionif.@EMBEDDEDSQLOUT@ \
- sqlerror.@EMBEDDEDSQLOUT@ oidif.@EMBEDDEDSQLOUT@ objectbroker.@EMBEDDEDSQLOUT@ \
- client.bm client.dbg client.log ir.out
+CLEANFILES += adminif.@EMBEDDEDSQLOUT@
+CLEANFILES += databaseif.@EMBEDDEDSQLOUT@
+CLEANFILES += transactionif.@EMBEDDEDSQLOUT@
+CLEANFILES += sqlerror.@EMBEDDEDSQLOUT@
+CLEANFILES += oidif.@EMBEDDEDSQLOUT@
+CLEANFILES += objectbroker.@EMBEDDEDSQLOUT@
+CLEANFILES += client.bm client.dbg client.log ir.out
diff --git a/relblobif/Makefile-files b/relblobif/Makefile-files
index 2ff1127..6d45474 100644
--- a/relblobif/Makefile-files
+++ b/relblobif/Makefile-files
@@ -34,14 +34,15 @@ pkglib_LTLIBRARIES += librelblobif.la
librelblobif_la_SOURCES= blobtile.hh \
dbtile.cc dbtile.hh inlinetile.cc inlinetile.hh \
blobtilecommon.cc tileid.hh
-EXTRA_librelblobif_la_SOURCES=blobtile.pgc
+EXTRA_librelblobif_la_SOURCES = relblobif/blobtile.pgc
librelblobif_la_LIBADD=blobtile.$(OBJEXT)
librelblobif_la_DEPENDENCIES=blobtile.$(OBJEXT)
librelblobif_la_CPPFLAGS = $(AM_CPPFLAGS)
librelblobif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
-BUILT_SOURCES += blobtile.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relblobif/blobtile.@EMBEDDEDSQLOUT@
-CLEANFILES += blobtile.@EMBEDDEDSQLOUT@ blobtile.$(OBJEXT)
+CLEANFILES += relblobif/blobtile.@EMBEDDEDSQLOUT@
+CLEANFILES += relblobif/blobtile.$(OBJEXT)
CLEANFILES += client.bm client.dbg client.log ir.out
diff --git a/relcatalogif/Makefile-files b/relcatalogif/Makefile-files
index 2f21c76..010a646 100644
--- a/relcatalogif/Makefile-files
+++ b/relcatalogif/Makefile-files
@@ -41,7 +41,7 @@ librelcatalogif_la_SOURCES= type.C type.hh basetype.C basetype.hh atomictype.C u
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_la_SOURCES= settype.pgc mddtype.pgc mddbasetype.pgc mdddomaintype.pgc mdddimensiontype.pgc structtype.pgc dbminterval.pgc
+EXTRA_librelcatalogif_la_SOURCES= relcatalogif/settype.pgc relcatalogif/mddtype.pgc relcatalogif/mddbasetype.pgc relcatalogif/mdddomaintype.pgc relcatalogif/mdddimensiontype.pgc relcatalogif/structtype.pgc relcatalogif/dbminterval.pgc
librelcatalogif_la_LIBADD= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJEXT) mdddimensiontype.$(OBJEXT) \
structtype.$(OBJEXT) dbminterval.$(OBJEXT) mdddomaintype.$(OBJEXT)
librelcatalogif_la_DEPENDENCIES= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJEXT) mdddimensiontype.$(OBJEXT) \
@@ -50,17 +50,23 @@ 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@ \
- mdddimensiontype.@EMBEDDEDSQLOUT@ structtype.@EMBEDDEDSQLOUT@ dbminterval.@EMBEDDEDSQLOUT@ \
- mdddomaintype.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relcatalogif/settype.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relcatalogif/mddtype.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relcatalogif/mddbasetype.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relcatalogif/mdddimensiontype.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relcatalogif/structtype.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relcatalogif/dbminterval.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relcatalogif/mdddomaintype.@EMBEDDEDSQLOUT@
+CLEANFILES += relcatalogif/settype.@EMBEDDEDSQLOUT@
+CLEANFILES += relcatalogif/mddtype.@EMBEDDEDSQLOUT@
+CLEANFILES += relcatalogif/mddbasetype.@EMBEDDEDSQLOUT@
+CLEANFILES += relcatalogif/mdddimensiontype.@EMBEDDEDSQLOUT@
+CLEANFILES += relcatalogif/structtype.@EMBEDDEDSQLOUT@
+CLEANFILES += relcatalogif/dbminterval.@EMBEDDEDSQLOUT@
+CLEANFILES += relcatalogif/mdddomaintype.@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
+CLEANFILES += client.bm client.dbg client.log ir.out core
diff --git a/relindexif/Makefile-files b/relindexif/Makefile-files
index ed625c4..efd0828 100644
--- a/relindexif/Makefile-files
+++ b/relindexif/Makefile-files
@@ -32,7 +32,10 @@ librelindexif_la_SOURCES=dbrcindexdscommon.cc dbrcindexds.hh \
dbtcindexcommon.cc dbtcindex.hh \
hierindexcommon.cc hierindex.hh \
indexid.hh
-EXTRA_librelindexif_la_SOURCES=dbrcindexds.pgc dbtcindex.pgc hierindex.pgc
+
+EXTRA_librelindexif_la_SOURCES = relindexif/dbrcindexds.pgc
+EXTRA_librelindexif_la_SOURCES += relindexif/dbtcindex.pgc
+EXTRA_librelindexif_la_SOURCES += relindexif/hierindex.pgc
librelindexif_la_LIBADD=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierindex.$(OBJEXT)
librelindexif_la_DEPENDENCIES=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierindex.$(OBJEXT)
@@ -40,10 +43,10 @@ librelindexif_la_DEPENDENCIES=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierinde
librelindexif_la_CPPFLAGS = $(AM_CPPFLAGS)
librelindexif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
-BUILT_SOURCES += dbrcindexds.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += dbtcindex.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += hierindex.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relindexif/dbrcindexds.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relindexif/dbtcindex.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relindexif/hierindex.@EMBEDDEDSQLOUT@
-CLEANFILES += dbrcindexds.@EMBEDDEDSQLOUT@
-CLEANFILES += dbtcindex.@EMBEDDEDSQLOUT@
-CLEANFILES += hierindex.@EMBEDDEDSQLOUT@
+CLEANFILES += relindexif/dbrcindexds.@EMBEDDEDSQLOUT@
+CLEANFILES += relindexif/dbtcindex.@EMBEDDEDSQLOUT@
+CLEANFILES += relindexif/hierindex.@EMBEDDEDSQLOUT@
diff --git a/relmddif/Makefile-files b/relmddif/Makefile-files
index 2fa61e6..e761cb6 100644
--- a/relmddif/Makefile-files
+++ b/relmddif/Makefile-files
@@ -32,15 +32,20 @@
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
+
+EXTRA_librelmddif_la_SOURCES = relmddif/dbmddobj.pgc
+EXTRA_librelmddif_la_SOURCES += relmddif/dbmddset.pgc
+
librelmddif_la_LIBADD=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT)
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 += relmddif/dbmddobj.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relmddif/dbmddset.@EMBEDDEDSQLOUT@
-CLEANFILES += dbmddobj.@EMBEDDEDSQLOUT@ dbmddset.@EMBEDDEDSQLOUT@
+CLEANFILES += relmddif/dbmddobj.@EMBEDDEDSQLOUT@
+CLEANFILES += relmddif/dbmddset.@EMBEDDEDSQLOUT@
CLEANFILES += client.bm client.dbg client.log ir.out core
diff --git a/relstorageif/Makefile-files b/relstorageif/Makefile-files
index f69a179..3a089b6 100644
--- a/relstorageif/Makefile-files
+++ b/relstorageif/Makefile-files
@@ -31,16 +31,18 @@
pkglib_LTLIBRARIES += librelstorageif.la
librelstorageif_la_SOURCES= dbstoragelayout.hh storageid.hh empty.cc
-EXTRA_librelstorageif_la_SOURCES= dbstoragelayout.pgc
+
+EXTRA_librelstorageif_la_SOURCES = relstorageif/dbstoragelayout.pgc
+
librelstorageif_la_LIBADD= dbstoragelayout.$(OBJEXT)
librelstorageif_la_DEPENDENCIES= dbstoragelayout.$(OBJEXT)
librelstorageif_la_CPPFLAGS = $(AM_CPPFLAGS)
librelstorageif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
-BUILT_SOURCES += dbstoragelayout.@EMBEDDEDSQLOUT@
+BUILT_SOURCES += relstorageif/dbstoragelayout.@EMBEDDEDSQLOUT@
+CLEANFILES += relstorageif/dbstoragelayout.@EMBEDDEDSQLOUT@
-CLEANFILES += dbstoragelayout.@EMBEDDEDSQLOUT@
CLEANFILES += client.bm client.dbg client.log ir.out