[Mobies-commit] [commit] r4199 - in UDM/trunk: bin lib src/Udm/PythonAPIGen

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Mon Oct  7 09:57:16 2013
New Revision: 4199

Log:
Fix ubuntu build. Broken since 'Remove Xalan from UdmDll'

Modified:
   UDM/trunk/bin/Makefile.am
   UDM/trunk/lib/Makefile.am
   UDM/trunk/src/Udm/PythonAPIGen/   (props changed)

Modified: UDM/trunk/bin/Makefile.am
==============================================================================
--- UDM/trunk/bin/Makefile.am	Fri Sep 27 16:03:24 2013	(r4198)
+++ UDM/trunk/bin/Makefile.am	Mon Oct  7 09:57:16 2013	(r4199)
@@ -45,7 +45,8 @@
 UdmToXmi_SOURCES	=
 UdmToXmi_LDADD	= \
 	../src/UdmToXmi/libudmtoxmi.la \
-	../lib/libudm.la
+	../lib/libudm.la \
+	../lib/libudmxmi.la
 nodist_EXTRA_UdmToXmi_SOURCES	= dummy.cxx
 
 
@@ -59,5 +60,6 @@
 XmiToUdm_SOURCES	=
 XmiToUdm_LDADD	= \
 	../src/XmiToUdm/libxmitoudm.la \
-	../lib/libudm.la
+	../lib/libudm.la \
+	../lib/libudmxmi.la
 nodist_EXTRA_XmiToUdm_SOURCES	= dummy.cxx

Modified: UDM/trunk/lib/Makefile.am
==============================================================================
--- UDM/trunk/lib/Makefile.am	Fri Sep 27 16:03:24 2013	(r4198)
+++ UDM/trunk/lib/Makefile.am	Mon Oct  7 09:57:16 2013	(r4199)
@@ -7,6 +7,9 @@
 endif
 
 lib_LTLIBRARIES		= libudm.la libUdmSwig.la
+if ! NO_XALAN
+lib_LTLIBRARIES += libudmxmi.la
+endif
 
 libudm_la_SOURCES	=
 libudm_la_LIBADD	= \
@@ -25,3 +28,11 @@
 libUdmSwig_la_LDFLAGS	= -version-info 3:1:3
 # Force C++ linking
 nodist_EXTRA_libUdmSwig_la_SOURCES	= dummy.cxx
+
+if ! NO_XALAN
+libudmxmi_la_SOURCES	=
+libudmxmi_la_LIBADD	= ../src/UdmXmi/libudmxmi.la libudm.la $(XERCESLIBS) $(XALANLIBS)
+libudmxmi_la_LDFLAGS	= -version-info 3:1:3
+# Force C++ linking
+nodist_EXTRA_libudmxmi_la_SOURCES	= dummy.cxx
+endif