From 3cd61fde56101b0de4e9d15bbd1553727d120b02 Mon Sep 17 00:00:00 2001 From: Ruud Overeem <overeem@astron.nl> Date: Wed, 26 Mar 2008 11:18:31 +0000 Subject: [PATCH] Bug 1167: Modifications for makeversion. --- .gitattributes | 1 - MAC/APL/RTDBCommon/configure.in | 1 - MAC/APL/RTDBCommon/include/APL/Makefile.am | 4 ---- MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am | 2 +- MAC/APL/RTDBCommon/include/Makefile.am | 2 +- MAC/APL/RTDBCommon/src/Makefile.am | 8 +++++++- 6 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 MAC/APL/RTDBCommon/include/APL/Makefile.am diff --git a/.gitattributes b/.gitattributes index c356ccf1393..6784302f8eb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -320,7 +320,6 @@ MAC/APL/RTDBCommon/Makefile.am -text MAC/APL/RTDBCommon/RTDBCommon.spec.in -text MAC/APL/RTDBCommon/bootstrap -text MAC/APL/RTDBCommon/configure.in -text -MAC/APL/RTDBCommon/include/APL/Makefile.am -text MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am -text MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h -text MAC/APL/RTDBCommon/include/Makefile.am -text diff --git a/MAC/APL/RTDBCommon/configure.in b/MAC/APL/RTDBCommon/configure.in index 5eb72eb93df..a8f93980e32 100644 --- a/MAC/APL/RTDBCommon/configure.in +++ b/MAC/APL/RTDBCommon/configure.in @@ -66,7 +66,6 @@ dnl Output Makefiles dnl AC_OUTPUT( include/Makefile -include/APL/Makefile include/APL/RTDBCommon/Makefile src/Makefile test/Makefile diff --git a/MAC/APL/RTDBCommon/include/APL/Makefile.am b/MAC/APL/RTDBCommon/include/APL/Makefile.am deleted file mode 100644 index 3a87bdc6431..00000000000 --- a/MAC/APL/RTDBCommon/include/APL/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ - -SUBDIRS = RTDBCommon - -include $(top_srcdir)/Makefile.common diff --git a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am index 940d32dddb1..aa8ccc6d38a 100644 --- a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am +++ b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/Makefile.am @@ -3,7 +3,7 @@ INSTHDRS = RTDButilities.h NOINSTHDRS = TCCHDRS = pkgincludedir = $(includedir)/APL/RTDBCommon -pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS) +pkginclude_HEADERS = Package__Version.h $(INSTHDRS) $(TCCHDRS) noinst_HEADERS = $(NOINSTHDRS) diff --git a/MAC/APL/RTDBCommon/include/Makefile.am b/MAC/APL/RTDBCommon/include/Makefile.am index 96c8fa3cc73..94347630a75 100644 --- a/MAC/APL/RTDBCommon/include/Makefile.am +++ b/MAC/APL/RTDBCommon/include/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = APL +SUBDIRS = APL/RTDBCommon include $(top_srcdir)/Makefile.common diff --git a/MAC/APL/RTDBCommon/src/Makefile.am b/MAC/APL/RTDBCommon/src/Makefile.am index 8bac89e9368..f43913df93e 100644 --- a/MAC/APL/RTDBCommon/src/Makefile.am +++ b/MAC/APL/RTDBCommon/src/Makefile.am @@ -9,8 +9,14 @@ pkginclude_HEADERS = $(BUILT_SOURCES) lib_LTLIBRARIES = librtdbcommon.la -librtdbcommon_la_SOURCES = $(BUILT_SOURCES) \ +librtdbcommon_la_SOURCES = Package__Version.cc $(BUILT_SOURCES) \ RTDButilities.cc +bin_PROGRAMS = versionaplcommon + +versionaplcommon_SOURCES = versionaplcommon.cc +versionaplcommon_LDADD = librtdbcommon.la +versionaplcommon_DEPENDENCIES = librtdbcommon.la $(LOFAR_DEPEND) + include $(top_srcdir)/Makefile.common -- GitLab