[mapguide-commits] r8671 - in sandbox/jng/diet/Server/src: Core UnitTesting

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-05-15 08:06:05 -0700 (Fri, 15 May 2015)
New Revision: 8671

Modified:
   sandbox/jng/diet/Server/src/Core/Makefile.am
   sandbox/jng/diet/Server/src/UnitTesting/Makefile.am
Log:
Fix cppunit and DWF Toolkit paths

Modified: sandbox/jng/diet/Server/src/Core/Makefile.am
===================================================================
--- sandbox/jng/diet/Server/src/Core/Makefile.am	2015-05-15 11:59:26 UTC (rev 8670)
+++ sandbox/jng/diet/Server/src/Core/Makefile.am	2015-05-15 15:06:05 UTC (rev 8671)
@@ -130,9 +130,10 @@
 mgserver_LDFLAGS = \
   -R$(map_fdo_lib) \
   -R$(mg_oem_ace_src)/ACE_wrappers/ace \
-  -R$(mg_oem_dwftk_src)/develop/global/src/dwfcore \
-  -R$(mg_oem_dwftk_src)/develop/global/src/dwf \
+  -R$(mg_oem_dwftk_src)/develop/global/src/dwfcore/.libs \
+  -R$(mg_oem_dwftk_src)/develop/global/src/dwf/.libs \
   -R$(mg_oem_dbxml_src)/install/lib \
+  -R$(mg_oem_cppunit_src)/src/cppunit/.libs \
   -R$(map_srcdir)/Common/CoordinateSystem/.libs \
   -R$(map_srcdir)/Common/MdfModel/.libs \
   -R$(map_srcdir)/Common/MdfParser/.libs \

Modified: sandbox/jng/diet/Server/src/UnitTesting/Makefile.am
===================================================================
--- sandbox/jng/diet/Server/src/UnitTesting/Makefile.am	2015-05-15 11:59:26 UTC (rev 8670)
+++ sandbox/jng/diet/Server/src/UnitTesting/Makefile.am	2015-05-15 15:06:05 UTC (rev 8671)
@@ -78,4 +78,4 @@
 libMgUnitTesting_la_LIBADD = -lcppunit
 
 libMgUnitTesting_la_LDFLAGS = -rpath /createshared -release $(PACKAGE_VERSION) \
-  -L$(mg_oem_cppunit_src)/src/cppunit
+  -L$(mg_oem_cppunit_src)/src/cppunit/.libs