BugID: 377

Some more cosmetic changes for rpm building.

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 \

MAC/GCF/Protocols/src/Makefile.am

 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

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)
 	

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

MAC/GCF/TM/test/Makefile.am

 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 \

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 \