From 87eb7dc9a6b96e5cab6ca5d17ee7d1ece3b8e79a Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Wed, 26 Mar 2008 11:14:43 +0000
Subject: [PATCH] Bug 1167: Modifications for makeversion.

---
 MAC/APL/APLCommon/configure.in                      | 1 -
 MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am | 2 +-
 MAC/APL/APLCommon/include/APL/Makefile.am           | 3 ---
 MAC/APL/APLCommon/include/Makefile.am               | 2 +-
 MAC/APL/APLCommon/src/Makefile.am                   | 8 +++++++-
 5 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 MAC/APL/APLCommon/include/APL/Makefile.am

diff --git a/MAC/APL/APLCommon/configure.in b/MAC/APL/APLCommon/configure.in
index f656400be8b..effeece09eb 100644
--- a/MAC/APL/APLCommon/configure.in
+++ b/MAC/APL/APLCommon/configure.in
@@ -65,7 +65,6 @@ dnl Output Makefiles
 dnl
 AC_OUTPUT(
 include/Makefile
-include/APL/Makefile
 include/APL/APLCommon/Makefile
 src/Makefile
 test/Makefile
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am b/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
index ba8e9830e7c..6ca6fe69012 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
@@ -1,5 +1,5 @@
 pkgincludedir = $(includedir)/APL/APLCommon
-pkginclude_HEADERS = \
+pkginclude_HEADERS = Package__Version.h  \
 	APLCommonExceptions.h \
 	APL_Defines.h \
 	APLUtilities.h \
diff --git a/MAC/APL/APLCommon/include/APL/Makefile.am b/MAC/APL/APLCommon/include/APL/Makefile.am
deleted file mode 100644
index 3f54b0c18e6..00000000000
--- a/MAC/APL/APLCommon/include/APL/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APLCommon
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/include/Makefile.am b/MAC/APL/APLCommon/include/Makefile.am
index 803db7814f3..d992ae34463 100644
--- a/MAC/APL/APLCommon/include/Makefile.am
+++ b/MAC/APL/APLCommon/include/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS	= APL
+SUBDIRS	= APL/APLCommon
 
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/src/Makefile.am b/MAC/APL/APLCommon/src/Makefile.am
index 2008d757180..95239dfcabc 100644
--- a/MAC/APL/APLCommon/src/Makefile.am
+++ b/MAC/APL/APLCommon/src/Makefile.am
@@ -16,7 +16,7 @@ libaplcommon_la_CPPFLAGS =  -DBOOST_DISABLE_THREADS \
 							-fmessage-length=0 \
 							-fdiagnostics-show-location=once
 
-libaplcommon_la_SOURCES  =  $(DOCHDRS) \
+libaplcommon_la_SOURCES  = Package__Version.cc   $(DOCHDRS) \
 							StartDaemon_Protocol.cc \
 							Controller_Protocol.cc \
 							APLUtilities.cc \
@@ -44,5 +44,11 @@ ph_HEADERS 				= StartDaemon_Protocol.ph \
 clean-local:
 	rm -f *.ph
 
+bin_PROGRAMS = versionaplcommon
+
+versionaplcommon_SOURCES      = versionaplcommon.cc
+versionaplcommon_LDADD        = libaplcommon.la
+versionaplcommon_DEPENDENCIES = libaplcommon.la $(LOFAR_DEPEND)
+
 include $(top_srcdir)/Makefile.common
 
-- 
GitLab