harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r673311 - /harmony/enhanced/classlib/trunk/depends/build/rules.mk
Date Wed, 02 Jul 2008 08:17:39 GMT
Author: hindessm
Date: Wed Jul  2 01:17:38 2008
New Revision: 673311

URL: http://svn.apache.org/viewvc?rev=673311&view=rev
Log:
Convert entries in MDLLIBFILES from "$(LIBPATH)libfoo.so $(DLLPATH)libbar.so"
to "-L$(LIBPATH) -L$(DLLPATH) -lfoo -lbar" while keeping the full path
available for make dependency checking.  This helps on platforms that
hardcode paths if the first form is used.

Modified:
    harmony/enhanced/classlib/trunk/depends/build/rules.mk

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?rev=673311&r1=673310&r2=673311&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Wed Jul  2 01:17:38 2008
@@ -21,6 +21,13 @@
 CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(CXXFLAGS)
 EXPFILE = $(notdir $(basename $(DLLNAME))).exp
 
+# Convert $(LIBPATH)libblah.so to -L$(LIBPATH) ... -lblah, also for $(DLLPATH)
+MDLLIBARGS := \
+  $(MDLLIBPREFIX) -L$(LIBPATH) -L$(DLLPATH) \
+  $(patsubst $(LIBPATH)lib%$(HY_LINKLIB_SUFFIX),-l%, \
+    $(patsubst $(DLLPATH)lib%$(HY_LINKLIB_SUFFIX),-l%, $(MDLLIBFILES))) \
+  $(MDLLIBSUFFIX)
+
 all: $(DLLNAME) $(EXENAME) $(LIBNAME)
 
 $(LIBNAME): $(BUILDFILES)
@@ -40,15 +47,11 @@
 
 $(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) $(EXPFILE)
 	$(DLL_LD) $(DLL_LDFLAGS) $(LDFLAGS) $(VMLINK) -o $@ \
-	$(BUILDFILES) \
-	$(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX) \
-	$(OSLIBS)
+	$(BUILDFILES) $(MDLLIBARGS) $(OSLIBS)
 
 $(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
 	$(CC) $(VMLINK) $(EXELDFLAGS) \
-	$(BUILDFILES) \
-	$(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX) \
-	-o $@ $(OSLIBS) \
+	$(BUILDFILES) $(MDLLIBARGS) -o $@ $(OSLIBS) \
 	$(EXERPATHPREFIX) -L$(HY_HDK)/jdk/jre/bin
 
 clean:



Mime
View raw message