You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/01/22 16:13:15 UTC
svn commit: r498641 - in /harmony/enhanced/classlib/trunk: depends/build/
depends/build/platform/ modules/awt/src/main/native/gl/unix/
modules/awt/src/main/native/linuxfont/unix/
modules/awt/src/main/native/oglwrapper/unix/ modules/awt/src/main/native/...
Author: hindessm
Date: Mon Jan 22 07:13:14 2007
New Revision: 498641
URL: http://svn.apache.org/viewvc?view=rev&rev=498641
Log:
Better handling of system libraries for different platforms.
Modified:
harmony/enhanced/classlib/trunk/depends/build/defines.mk
harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile
Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=498641&r1=498640&r2=498641
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Mon Jan 22 07:13:14 2007
@@ -24,6 +24,7 @@
DLL_LD = $(CC)
CXX_DLL_LD = $(CXX)
OSLIBS = -lc -lm
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft
include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk?view=diff&rev=498641&r1=498640&r2=498641
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk Mon Jan 22 07:13:14 2007
@@ -15,3 +15,4 @@
DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64
OPT += -fpic
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile?view=diff&rev=498641&r1=498640&r2=498641
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile Mon Jan 22 07:13:14 2007
@@ -32,7 +32,7 @@
$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
-SYSLIBFILES = -lstdc++
+OSLIBS += -lstdc++
DLLNAME=../libgl.so
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile?view=diff&rev=498641&r1=498640&r2=498641
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile Mon Jan 22 07:13:14 2007
@@ -28,11 +28,7 @@
$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
-ifeq ($(HY_ARCH),x86_64)
- SYSLIBFILES = -L/usr/X11R6/lib64 -lX11 -lXft
-else
- SYSLIBFILES = -L/usr/X11R6/lib -lX11 -lXft
-endif
+OSLIBS += $(XLIBS)
DLLNAME=../liblinuxfont.so
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile?view=diff&rev=498641&r1=498640&r2=498641
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile Mon Jan 22 07:13:14 2007
@@ -25,7 +25,7 @@
$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
-SYSLIBFILES = -lstdc++
+OSLIBS += -lstdc++
DLLNAME=../liboglwrapper.so
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile?view=diff&rev=498641&r1=498640&r2=498641
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile Mon Jan 22 07:13:14 2007
@@ -28,11 +28,7 @@
$(DLLPATH)libhysig.so $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so $(LIBPATH)libhycommon.a \
$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(DLLPATH)libhythr.so $(LIBPATH)libvmi.so
-ifeq ($(HY_ARCH),x86_64)
- SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib64 -lX11
-else
- SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib -lX11
-endif
+OSLIBS += -lstdc++ $(XLIBS)
DLLNAME=../libX11Wrapper.so
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile?view=diff&rev=498641&r1=498640&r2=498641
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile Mon Jan 22 07:13:14 2007
@@ -26,7 +26,7 @@
$(SHAREDSUB)hythread.o $(SHAREDSUB)hythreadinspect.o linuxonexit.o priority.o \
rasthrsup.o $(SHAREDSUB)rwmutex.o thrcreate.o thrdsup.o $(SHAREDSUB)thrprof.o
-SYSLIBFILES = -lpthread
+OSLIBS += -lpthread
MDLLIBFILES = $(LIBPATH)libhypool.a $(LIBPATH)libhycommon.a
DLLNAME = ../libhythr.so