From 83a5e90fc1bde0614c697eaa307a9a733e157e5e Mon Sep 17 00:00:00 2001 From: Ger van Diepen <diepen@astron.nl> Date: Mon, 10 Mar 2008 09:52:16 +0000 Subject: [PATCH] bug 468: Make Version info work --- CEP/BB/ParmFacade/configure.in | 2 +- CEP/BB/ParmFacade/include/ParmFacade/Makefile.am | 2 +- CEP/BB/ParmFacade/src/Makefile.am | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CEP/BB/ParmFacade/configure.in b/CEP/BB/ParmFacade/configure.in index 4a7456316e9..8473c008bd8 100644 --- a/CEP/BB/ParmFacade/configure.in +++ b/CEP/BB/ParmFacade/configure.in @@ -54,7 +54,7 @@ dnl dnl Check for LOFAR specific things dnl lofar_GENERAL -lofar_INTERNAL(CEP/BB/BBSKernel,BBSKernel,,1,BBSKernel/MNS/MeqParmFunklet.h) +lofar_INTERNAL(CEP/BB/BBSKernel,BBSKernel,,1,BBSKernel/BBSStatus.h) lofar_INTERNAL(CEP/BB/ParmDB,ParmDB,,1,ParmDB/ParmDB.h) lofar_INTERNAL(LCS/Blob,Blob,,1,Blob/BlobHeader.h) lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,) diff --git a/CEP/BB/ParmFacade/include/ParmFacade/Makefile.am b/CEP/BB/ParmFacade/include/ParmFacade/Makefile.am index a9268a936ab..b2964eed9bd 100644 --- a/CEP/BB/ParmFacade/include/ParmFacade/Makefile.am +++ b/CEP/BB/ParmFacade/include/ParmFacade/Makefile.am @@ -5,7 +5,7 @@ NOINSTHDRS = TCCHDRS = -pkginclude_HEADERS = $(INSTHDRS) $(TCCHDRS) +pkginclude_HEADERS = Package__Version.h $(INSTHDRS) $(TCCHDRS) noinst_HEADERS = $(NOINSTHDRS) diff --git a/CEP/BB/ParmFacade/src/Makefile.am b/CEP/BB/ParmFacade/src/Makefile.am index f125eb72f58..7e41c3c9409 100644 --- a/CEP/BB/ParmFacade/src/Makefile.am +++ b/CEP/BB/ParmFacade/src/Makefile.am @@ -1,7 +1,6 @@ -lib_LTLIBRARIES = _parmdb.la #libparmfacade.la +lib_LTLIBRARIES = _parmdb.la libparmfacade.la -#libparmfacade_la_SOURCES = \ -#ParmFacade.cc +libparmfacade_la_SOURCES = Package__Version.cc _parmdb_la_SOURCES = pyparmdb.cc ParmFacade.cc # Needed for non-standard library name (i.e. not lib...) @@ -12,4 +11,10 @@ _parmdb_la_DEPENDENCIES = $(LOFAR_DEPEND) python_SCRIPTS = __init__.py pythondir = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/lofar/parmdb +bin_PROGRAMS = versionparmfacade + +versionparmfacade_SOURCES = versionparmfacade.cc +versionparmfacade_LDADD = libparmfacade.la +versionparmfacade_DEPENDENCIES = libparmfacade.la $(LOFAR_DEPEND) + include $(top_srcdir)/Makefile.common -- GitLab