From e01552e67d1412a7e973ba4132184796e20fcfd1 Mon Sep 17 00:00:00 2001
From: Alexander Mueller <alexander.mueller@hs.uni-hamburg.de>
Date: Wed, 2 Nov 2005 16:31:15 +0000
Subject: [PATCH] BugID: 377 Some more cosmetic changes for rpm building.
---
MAC/GCF/LogSys/KVLogSys/src/Makefile.am | 6 +++---
MAC/GCF/Protocols/src/Makefile.am | 9 +++++----
MAC/GCF/TM/src/Makefile.am | 4 ++--
MAC/GCF/TM/src/ServiceBroker/Makefile.am | 2 +-
MAC/GCF/TM/test/Makefile.am | 8 ++++----
MAC/GCF/_PAL/SAL/test/Makefile.am | 8 ++++----
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/MAC/GCF/LogSys/KVLogSys/src/Makefile.am b/MAC/GCF/LogSys/KVLogSys/src/Makefile.am
index 45ccf67fb2b..aa5bde7bd52 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/Makefile.am
+++ b/MAC/GCF/LogSys/KVLogSys/src/Makefile.am
@@ -10,7 +10,7 @@ DOCHDRS = \
KeyValueLoggerMaster.h \
KVLUtils.h \
PropertyLogger.h \
- KVL_Protocol.ph
+ $(BUILT_SOURCES)
lib_LTLIBRARIES = libgcfkvlc.la
@@ -51,9 +51,9 @@ KeyValueLoggerMaster_LDADD = libkvlm.la $(LOFAR_DEPEND)
KeyValueLoggerMaster_DEPENDENCIES = libkvlm.la $(LOFAR_DEPEND)
KeyValueLoggerMaster_CPPFLAGS = $(libkvlm_la_CPPFLAGS)
-BUILT_SOURCES =
+BUILT_SOURCES = KVL_Protocol.ph
-EXTRA_DIST = KVL_Protocol.prot $(sysconf_DATA)
+EXTRA_DIST = $(sysconf_DATA)
sysconf_DATA= \
KeyValueLoggerDaemon.conf \
diff --git a/MAC/GCF/Protocols/src/Makefile.am b/MAC/GCF/Protocols/src/Makefile.am
index fea6a65fc3f..d92066d5546 100644
--- a/MAC/GCF/Protocols/src/Makefile.am
+++ b/MAC/GCF/Protocols/src/Makefile.am
@@ -1,7 +1,6 @@
pkgincludedir = $(includedir)/GCF/Protocols
pkginclude_HEADERS = \
- PI_Protocol.ph \
- PA_Protocol.ph \
+ $(BUILT_SOURCES) \
DH_PIProtocol.h
AUTOGEN = autogen
@@ -22,9 +21,11 @@ libgcfpirtcprot_la_SOURCES= $(DOCHDRS) \
libgcfpaprot_la_SOURCES= $(DOCHDRS) \
PA_Protocol.cc
-BUILT_SOURCES =
+BUILT_SOURCES = \
+ PI_Protocol.ph \
+ PA_Protocol.ph
-EXTRA_DIST = PI_Protocol.prot PA_Protocol.prot $(sysconf_DATA)
+EXTRA_DIST = $(sysconf_DATA)
sysconf_DATA= \
PropertyInterface.conf
diff --git a/MAC/GCF/TM/src/Makefile.am b/MAC/GCF/TM/src/Makefile.am
index 216ab39a932..17edeb76c32 100644
--- a/MAC/GCF/TM/src/Makefile.am
+++ b/MAC/GCF/TM/src/Makefile.am
@@ -17,7 +17,7 @@ DOCHDRS = \
PortImpl/GTM_Device.h \
ServiceBroker/GTM_SBTCPPort.h \
ServiceBroker/GTM_ServiceBroker.h \
- SB_Protocol.ph
+ $(BUILT_SOURCES)
lib_LTLIBRARIES = libgcftm.la
@@ -47,7 +47,7 @@ libgcftm_la_CPPFLAGS=-I$(top_srcdir)/src/ServiceBroker
libgcftm_la_CXXFLAGS=-fmessage-length=0
-BUILT_SOURCES =
+BUILT_SOURCES = SB_Protocol.ph
EXTRA_DIST = $(sysconf_DATA)
diff --git a/MAC/GCF/TM/src/ServiceBroker/Makefile.am b/MAC/GCF/TM/src/ServiceBroker/Makefile.am
index a2514c2795e..1776af51bec 100644
--- a/MAC/GCF/TM/src/ServiceBroker/Makefile.am
+++ b/MAC/GCF/TM/src/ServiceBroker/Makefile.am
@@ -22,7 +22,7 @@ ServiceBroker_CXXFLAGS=-fmessage-length=0
BUILT_SOURCES =
-EXTRA_DIST = SB_Protocol.prot $(sysconf_DATA)
+EXTRA_DIST = $(sysconf_DATA)
sysconf_DATA= \
ServiceBroker.conf
diff --git a/MAC/GCF/TM/test/Makefile.am b/MAC/GCF/TM/test/Makefile.am
index 1e5c4375e39..99d599d4e16 100644
--- a/MAC/GCF/TM/test/Makefile.am
+++ b/MAC/GCF/TM/test/Makefile.am
@@ -1,10 +1,10 @@
bin_PROGRAMS = tmEcho tmPing
-tmEcho_SOURCES = Echo_Protocol.ph Echo_Protocol.cc Echo.cc Echo.h
+tmEcho_SOURCES = $(BUILT_SOURCES) Echo_Protocol.cc Echo.cc Echo.h
tmEcho_LDADD = ../src/libgcftm.la
tmEcho_DEPENDENCIES = ../src/libgcftm.la $(LOFAR_DEPEND)
-tmPing_SOURCES = Echo_Protocol.ph Echo_Protocol.cc Ping.cc Ping.h
+tmPing_SOURCES = $(BUILT_SOURCES) Echo_Protocol.cc Ping.cc Ping.h
tmPing_LDADD = ../src/libgcftm.la
tmPing_DEPENDENCIES = ../src/libgcftm.la $(LOFAR_DEPEND)
@@ -13,9 +13,9 @@ SUFFIXES = .ph
%.ph: %.prot
$(AUTOGEN) --writable -L $(top_srcdir)/autogen $<
-BUILT_SOURCES =
+BUILT_SOURCES = Echo_Protocol.ph
-EXTRA_DIST = Echo_Protocol.prot $(sysconf_DATA)
+EXTRA_DIST = $(sysconf_DATA)
sysconf_DATA=\
tmEcho.conf \
diff --git a/MAC/GCF/_PAL/SAL/test/Makefile.am b/MAC/GCF/_PAL/SAL/test/Makefile.am
index 0775fbece60..e06a7a0a90a 100644
--- a/MAC/GCF/_PAL/SAL/test/Makefile.am
+++ b/MAC/GCF/_PAL/SAL/test/Makefile.am
@@ -4,11 +4,11 @@ check_PROGRAMS = salEcho salPing
TESTS = #salEcho salPing
-salEcho_SOURCES = Echo_Protocol.ph Echo.cc Service.cc Echo_Protocol.cc
+salEcho_SOURCES = $(BUILT_SOURCES) Echo.cc Service.cc Echo_Protocol.cc
salEcho_LDADD = ../src/libsal.la $(LOFAR_DEPEND)
salEcho_DEPENDENCIES = ../src/libsal.la $(LOFAR_DEPEND)
-salPing_SOURCES = Echo_Protocol.ph Ping.cc Echo_Protocol.cc
+salPing_SOURCES = $(BUILT_SOURCES) Ping.cc Echo_Protocol.cc
salPing_LDADD = ../src/libsal.la $(LOFAR_DEPEND)
salPing_DEPENDENCIES = ../src/libsal.la $(LOFAR_DEPEND)
@@ -17,9 +17,9 @@ SUFFIXES = .ph
%.ph: %.prot
$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-BUILT_SOURCES =
+BUILT_SOURCES = Echo_Protocol.ph
-EXTRA_DIST = Echo_Protocol.prot $(sysconf_DATA)
+EXTRA_DIST = $(sysconf_DATA)
sysconf_DATA= \
salEcho.conf \
--
GitLab