[openrtm-commit:02055] r2781 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2016-10-13 16:15:49 +0900 (Thu, 13 Oct 2016)
New Revision: 2781

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
Log:
[compat,build,->RELENG_1_2] config_rtc.h definitions are now guarded by #ifndef macro. refs #3660

Modified: trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Makefile.am	2016-10-13 04:56:17 UTC (rev 2780)
+++ trunk/OpenRTM-aist/src/lib/rtm/Makefile.am	2016-10-13 07:15:49 UTC (rev 2781)
@@ -14,7 +14,7 @@
 AM_LDFLAGS=-L$(top_builddir) -L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl -L$(top_builddir)/src/lib/coil/lib
 
 # version.h would be generated from configure before lib build process.
-BUILT_SOURCES = version.h version.txt
+BUILT_SOURCES = version.h version.txt config_rtc.h.org
 version.h:
 	echo '// This header file is automatically generated.' > $@
 	echo '// Do not edit this file.' >> $@
@@ -33,6 +33,10 @@
 	echo 'short_version = '${RTM_SHORT_VERSION} >> $@
 	echo 'corba = '${ORB} >> $@
 
+config_rtc.h.org:
+	mv config_rtc.h config_rtc.h.org
+	awk '/^#define/{printf("#ifndef %s\n%s\n#endif // %s\n",$$2,$$0,$$2);} !/^#define/{print $$0;}' config_rtc.h.org > config_rtc.h
+
 # libRTC.so, libRTC.a library build entry
 lib_LTLIBRARIES = libRTC.la
 
@@ -232,7 +236,7 @@
 		--source $(RTC_SRC) \
 		--header $(rtmheader_HEADERS)
 	qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc12.vcxproj
-	
+
 vc14proj: libRTC.vcproj.yaml
 	$(top_builddir)/build/vcxprojtool.py vcxproj \
 		--type DLL \
@@ -259,6 +263,7 @@
 dist-hook: lst vcproj wxs
 
 clean-local:
+	rm -f config_rtc.h.org
 	rm -f *~ Makefile.old *core
 	rm -f *.lst
 	rm -f *.gch *.bak *.rpo *.sym lib*.*_pure_*