harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r379471 - in /incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32: archive/ common/ fdlibm/ launcher/ luni/ math/ nio/ pool/ port/ sig/ text/ thread/ vmi/ zip/ zlib/
Date Tue, 21 Feb 2006 14:58:44 GMT
Author: tellison
Date: Tue Feb 21 06:58:41 2006
New Revision: 379471

URL: http://svn.apache.org/viewcvs?rev=379471&view=rev
Log:
Apply patch HARMONY-109 (reducing the verbose auto-generated variable names in linux makefiles)

Modified:
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile Tue Feb
21 06:58:41 2006
@@ -28,21 +28,20 @@
 
 CFLAGS= -fpic  -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86
-I../include -I../archive -I../common -I../zlib -I../zip -I../fdlibm  $(VMDEBUG)
 
+BUILDFILES = \
+	archive_copyright.o jclcrc32.o zip.o adler32.o inflater.o \
+	jarfile.o deflater.o archiveglob.o
 
+MDLLIBFILES = \
+	../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \
+	../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
 
-BUILDFILES1 = archive_copyright.o jclcrc32.o zip.o adler32.o inflater.o
-BUILDFILES2 = jarfile.o deflater.o archiveglob.o
+all: $(DLLNAME)
 
-MDLLIBFILES1 = ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a
-MDLLIBFILES2 = ../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
-
-all: \
-	 $(DLLNAME)
-
-$(DLLNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	 $(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -L../lib -L.. -o $(DLLNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) -Xlinker --start-group \
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) 
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -L../lib -L.. -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group \
 	-lhysig \
 	-lhyzip \
 	-lhyzlib \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile Tue Feb
21 06:58:41 2006
@@ -22,20 +22,14 @@
 
 LIBPATH=../lib/# declaration
 
-BUILDFILES1 = libglob.o iohelp.o utf8encode.o utf8decode.o
-
-MDLLIBFILES1 = ../libjsig.so ../lib/libhyzip.a ../libhyzlib23.so ../lib/libhycommon.a ../lib/libhypool.a
-MDLLIBFILES2 = ../lib/libhyfdlibm.a ../libhythr23.so ../libvmi.so
+BUILDFILES = libglob.o iohelp.o utf8encode.o utf8decode.o
 
 CFLAGS= -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86 -I../include
-I../common -I../zlib -I../zip -I../fdlibm  $(VMDEBUG)
 
-
 all: $(LIBPATH)$(LIBNAME)
 
-$(LIBPATH)$(LIBNAME):\
-	$(BUILDFILES1) 
-	$(AR) rcv $(LIBPATH)$(LIBNAME) \
-	$(BUILDFILES1) 
+$(LIBPATH)$(LIBNAME): $(BUILDFILES) 
+	$(AR) rcv $(LIBPATH)$(LIBNAME) $(BUILDFILES)
 
 clean:
 	-rm -f *.o

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile Tue Feb
21 06:58:41 2006
@@ -22,39 +22,30 @@
 
 LIBPATH=../lib/# declaration
 
-BUILDFILES1 = e_acos.o e_acosh.o e_asin.o e_atan2.o e_atanh.o
-BUILDFILES2 = e_cosh.o e_exp.o e_fmod.o e_gamma.o e_gamma_r.o
-BUILDFILES3 = e_hypot.o e_j0.o e_j1.o e_jn.o e_lgamma.o
-BUILDFILES4 = e_lgamma_r.o e_log.o e_log10.o e_pow.o e_rem_pio2.o
-BUILDFILES5 = e_remainder.o e_scalb.o e_sinh.o e_sqrt.o k_cos.o
-BUILDFILES6 = k_rem_pio2.o k_sin.o k_standard.o k_tan.o s_asinh.o
-BUILDFILES7 = s_atan.o s_cbrt.o s_ceil.o s_copysign.o s_cos.o
-BUILDFILES8 = s_erf.o s_expm1.o s_fabs.o s_finite.o s_floor.o
-BUILDFILES9 = s_frexp.o s_ilogb.o s_isnan.o s_ldexp.o s_lib_version.o
-BUILDFILES10 = s_log1p.o s_logb.o s_matherr.o s_modf.o s_nextafter.o
-BUILDFILES11 = s_rint.o s_scalbn.o s_signgam.o s_significand.o s_sin.o
-BUILDFILES12 = s_tan.o s_tanh.o w_acos.o w_acosh.o w_asin.o
-BUILDFILES13 = w_atan2.o w_atanh.o w_cosh.o w_exp.o w_fmod.o
-BUILDFILES14 = w_gamma.o w_gamma_r.o w_hypot.o w_j0.o w_j1.o
-BUILDFILES15 = w_jn.o w_lgamma.o w_lgamma_r.o w_log.o w_log10.o
-BUILDFILES16 = w_pow.o w_remainder.o w_scalb.o w_sinh.o w_sqrt.o
+BUILDFILES = \
+	e_acos.o e_acosh.o e_asin.o e_atan2.o e_atanh.o \
+	e_cosh.o e_exp.o e_fmod.o e_gamma.o e_gamma_r.o \
+	e_hypot.o e_j0.o e_j1.o e_jn.o e_lgamma.o \
+	e_lgamma_r.o e_log.o e_log10.o e_pow.o e_rem_pio2.o \
+	e_remainder.o e_scalb.o e_sinh.o e_sqrt.o k_cos.o \
+	k_rem_pio2.o k_sin.o k_standard.o k_tan.o s_asinh.o \
+	s_atan.o s_cbrt.o s_ceil.o s_copysign.o s_cos.o \
+	s_erf.o s_expm1.o s_fabs.o s_finite.o s_floor.o \
+	s_frexp.o s_ilogb.o s_isnan.o s_ldexp.o s_lib_version.o \
+	s_log1p.o s_logb.o s_matherr.o s_modf.o s_nextafter.o \
+	s_rint.o s_scalbn.o s_signgam.o s_significand.o s_sin.o \
+	s_tan.o s_tanh.o w_acos.o w_acosh.o w_asin.o \
+	w_atan2.o w_atanh.o w_cosh.o w_exp.o w_fmod.o \
+	w_gamma.o w_gamma_r.o w_hypot.o w_j0.o w_j1.o \
+	w_jn.o w_lgamma.o w_lgamma_r.o w_log.o w_log10.o \
+	w_pow.o w_remainder.o w_scalb.o w_sinh.o w_sqrt.o
 
 CFLAGS=-O0 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -D_IEEE_LIBM -DHY_PLATFORM_DOUBLE_ORDER
-I../include -ffloat-store $(VMDEBUG)
 
-
-
 all: $(LIBPATH)$(LIBNAME)
 
-$(LIBPATH)$(LIBNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(BUILDFILES7) $(BUILDFILES8) $(BUILDFILES9) $(BUILDFILES10) \
-	$(BUILDFILES11) $(BUILDFILES12) $(BUILDFILES13) $(BUILDFILES14) $(BUILDFILES15) \
-	$(BUILDFILES16) 
-	$(AR) rcv $(LIBPATH)$(LIBNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(BUILDFILES7) $(BUILDFILES8) $(BUILDFILES9) $(BUILDFILES10) \
-	$(BUILDFILES11) $(BUILDFILES12) $(BUILDFILES13) $(BUILDFILES14) $(BUILDFILES15) \
-	$(BUILDFILES16) 
+$(LIBPATH)$(LIBNAME): $(BUILDFILES)
+	$(AR) rcv $(LIBPATH)$(LIBNAME) $(BUILDFILES)
 
 clean:
 	-rm -f *.o

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile Tue
Feb 21 06:58:41 2006
@@ -23,17 +23,15 @@
 CFLAGS=-O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86  -I../include
$(VMDEBUG)
 
 
-BUILDFILES1 = main.o cmain.o launcher_copyright.o strbuf.o libhlp.o  
- 
-MDLLIBFILES1 = ../libhyprt.so ../libhythr.so ../libhysig.so
+BUILDFILES = main.o cmain.o launcher_copyright.o strbuf.o libhlp.o  
 
-all: \
-	$(EXENAME)
+MDLLIBFILES = ../libhyprt.so ../libhythr.so ../libhysig.so
 
-$(EXENAME):\
-	$(BUILDFILES1) $(MDLLIBFILES1) 
+all: $(EXENAME)
+
+$(EXENAME): $(BUILDFILES) $(MDLLIBFILES) 
 	$(CC) -L. -L.. -L../lib $(VMLINK) \
-	$(BUILDFILES1) $(VIRTFILES1) -Xlinker --start-group \
+	$(BUILDFILES) $(VIRTFILES1) -Xlinker --start-group \
 	-lhyprt \
 	-lhythr \
 	-Xlinker --end-group \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile Tue Feb
21 06:58:41 2006
@@ -28,27 +28,24 @@
 
 CFLAGS= -fpic  -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86
-I../include -I../luni -I../common -I../zlib -I../zip -I../fdlibm  $(VMDEBUG)
 
+BUILDFILES = \
+	luni_copyright.o file.o procimpl.o oos.o fileis.o \
+	simpl.o psimpl2.o nethelp.o floatbits.o rafile.o \
+	ois.o helpers.o math.o luniglob.o proxy.o \
+	netif.o process.o bigint.o osc.o socket.o \
+	inetadds.o pssimpl.o filedesc.o timezone.o pmsimpl.o \
+	pdsimpl.o fileos.o
 
+MDLLIBFILES = \
+	../lib/libhycommon.a ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so \
+	../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
 
-BUILDFILES1 = luni_copyright.o file.o procimpl.o oos.o fileis.o
-BUILDFILES2 = simpl.o psimpl2.o nethelp.o floatbits.o rafile.o
-BUILDFILES3 = ois.o helpers.o math.o luniglob.o proxy.o
-BUILDFILES4 = netif.o process.o bigint.o osc.o socket.o
-BUILDFILES5 = inetadds.o pssimpl.o filedesc.o timezone.o pmsimpl.o
-BUILDFILES6 = pdsimpl.o fileos.o
+all: $(DLLNAME)
 
-MDLLIBFILES1 = ../lib/libhycommon.a ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so
-MDLLIBFILES2 = ../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
-
-all: \
-	 $(DLLNAME)
-
-$(DLLNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	 $(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -L../lib -L.. -o $(DLLNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) -Xlinker --start-group \
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES)
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -L../lib -L.. -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group \
 	-lhycommon \
 	-lhysig \
 	-lhyzip \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/makefile Tue Feb
21 06:58:41 2006
@@ -28,21 +28,19 @@
 
 CFLAGS= -fpic  -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86
-I../include -I../math -I../common -I../zlib -I../zip -I../fdlibm  $(VMDEBUG)
 
+BUILDFILES = \
+	math_copyright.o fltparse.o mathglob.o dblparse.o bigint.o cbigint.o
 
+MDLLIBFILES = \
+	../lib/libhycommon.a ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so \
+	../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
 
-BUILDFILES1 = math_copyright.o fltparse.o mathglob.o dblparse.o bigint.o
-BUILDFILES2 = cbigint.o
+all: $(DLLNAME)
 
-MDLLIBFILES1 = ../lib/libhycommon.a ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so
-MDLLIBFILES2 = ../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
-
-all: \
-	 $(DLLNAME)
-
-$(DLLNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) $(MDLLIBFILES1) $(MDLLIBFILES2) 
-	 $(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -L../lib -L.. -o $(DLLNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) -Xlinker --start-group \
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES)
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -L../lib -L.. -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group \
 	-lhycommon \
 	-lhysig \
 	-lhyzip \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/makefile Tue Feb 21
06:58:41 2006
@@ -28,21 +28,20 @@
 
 CFLAGS=-fpic -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86  -I../include
-I../common -I../zlib -I../zip -I../fdlibm -I../nio $(VMDEBUG)
 
-
-BUILDFILES1 = nio_copyright.o helpers.o
-BUILDFILES2 = OSFileSystem.o OSFileSystemLinux32.o OSMemory.o OSMemoryLinux32.o nethelp.o
OSNetworkSystem.o socket.o
+BUILDFILES = \
+	nio_copyright.o helpers.o OSFileSystem.o OSFileSystemLinux32.o \
+	OSMemory.o OSMemoryLinux32.o nethelp.o OSNetworkSystem.o socket.o
  
-MDLLIBFILES1 = ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a ../lib/libhypool.a
-MDLLIBFILES2 = ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
+MDLLIBFILES = \
+	../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \
+	../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
 
-all: \
-	 $(DLLNAME)
+all: $(DLLNAME)
 
-$(DLLNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) 
-	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -L../lib -L.. -o $(DLLNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) -Xlinker --start-group \
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES)
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -L../lib -L.. -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group \
 	-lhysig \
 	-lhyzip \
 	-lhyzlib \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile Tue Feb
21 06:58:41 2006
@@ -22,17 +22,14 @@
 
 LIBPATH=../lib/# declaration
 
-BUILDFILES1 = pool.o pool_cap.o
+BUILDFILES = pool.o pool_cap.o
 
 CFLAGS= -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86 -I../include
 $(VMDEBUG)
 
-
 all: $(LIBPATH)$(LIBNAME)
 
-$(LIBPATH)$(LIBNAME):\
-	$(BUILDFILES1) 
-	$(AR) rcv $(LIBPATH)$(LIBNAME) \
-	$(BUILDFILES1) 
+$(LIBPATH)$(LIBNAME): $(BUILDFILES) 
+	$(AR) rcv $(LIBPATH)$(LIBNAME) $(BUILDFILES)
 
 clean:
 	-rm -f *.o

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile Tue Feb
21 06:58:41 2006
@@ -29,25 +29,23 @@
 CFLAGS= -fpic  -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86
-DHYPORT_LIBRARY_DEFINE -I../include  $(VMDEBUG)
 
 
-BUILDFILES1 = port_copyright.o hycpu.o hyerror.o hyerrorhelpers.o hyexit.o
-BUILDFILES2 = hyfile.o hyfiletext.o hygp.o hyipcmutex.o hymem.o
-BUILDFILES3 = hymmap.o hynls.o hynlshelpers.o hyosdump.o hyport.o
-BUILDFILES4 = hyportcontrol.o hyportptb.o hysharedhelper.o hyshmem.o hyshsem.o
-BUILDFILES5 = hysignal.o hysl.o hysock.o hystr.o hystrftime.o
-BUILDFILES6 = hystsl.o hysysinfo.o hytime.o hytlshelpers.o hytty.o
-BUILDFILES7 = hyvmem.o
+BUILDFILES = \
+	port_copyright.o hycpu.o hyerror.o hyerrorhelpers.o hyexit.o \
+	hyfile.o hyfiletext.o hygp.o hyipcmutex.o hymem.o \
+	hymmap.o hynls.o hynlshelpers.o hyosdump.o hyport.o \
+	hyportcontrol.o hyportptb.o hysharedhelper.o hyshmem.o hyshsem.o \
+	hysignal.o hysl.o hysock.o hystr.o hystrftime.o \
+	hystsl.o hysysinfo.o hytime.o hytlshelpers.o hytty.o \
+	hyvmem.o
 
-MDLLIBFILES1 = ../libhythr.so ../lib/libhycommon.a ../libhysig.so
+MDLLIBFILES = ../libhythr.so ../lib/libhycommon.a ../libhysig.so
 
-all: \
-	 $(DLLNAME)
+all: $(DLLNAME)
 
-$(DLLNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(BUILDFILES7) $(MDLLIBFILES1) 
-	 $(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -L../lib -L.. -o $(DLLNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(BUILDFILES4) $(BUILDFILES5) \
-	$(BUILDFILES6) $(BUILDFILES7) -Xlinker --start-group \
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) 
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -L../lib -L.. -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group \
 	-lhythr \
 	-lhycommon \
 	-lhysig \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile Tue Feb 21
06:58:41 2006
@@ -28,15 +28,14 @@
 
 CFLAGS=-fpic -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86 -I../include
$(VMDEBUG)
 
+BUILDFILES = jsig_copyright.o jsiglinux.o jsigunix.o
 
-BUILDFILES1 = jsig_copyright.o jsiglinux.o jsigunix.o
+all: $(DLLNAME)
 
-all: \
-	 $(DLLNAME)
-
-$(DLLNAME): $(BUILDFILES1) 
-	 $(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -o $(DLLNAME) \
-	$(BUILDFILES1) -Xlinker --start-group -Xlinker --end-group  -lc -lm -ldl
+$(DLLNAME): $(BUILDFILES) 
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group -Xlinker --end-group  -lc -lm -ldl
 
 clean:
 	-rm -f *.o 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile Tue Feb
21 06:58:41 2006
@@ -28,22 +28,19 @@
 
 CFLAGS=-fpic -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86  -I../include
-I../text -I../zlib -I../zip -I../fdlibm  $(VMDEBUG)
 
+BUILDFILES = text_copyright.o BidiWrapper.o
 
-BUILDFILES1 = text_copyright.o 
-BUILDFILES2 = BidiWrapper.o
+MDLLIBFILES = \
+	../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a \
+	../lib/libhypool.a ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
 
-MDLLIBFILES1 = ../libhysig.so ../lib/libhyzip.a ../libhyzlib.so ../lib/libhycommon.a ../lib/libhypool.a
-MDLLIBFILES2 = ../lib/libhyfdlibm.a ../libhythr.so ../libvmi.so
+all: $(DLLNAME)
 
-all: \
-	 $(DLLNAME)
-
-$(DLLNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) \
-	$(MDLLIBFILES1) $(MDLLIBFILES2) 
-	 $(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -L../lib -L.. -o $(DLLNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) -Xlinker --start-group \
-    libicuuc.so.34 \
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES)
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -L../lib -L.. -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group \
+	libicuuc.so.34 \
 	-lhysig \
 	-lhyzip \
 	-lhyzlib \

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile Tue Feb
21 06:58:41 2006
@@ -28,22 +28,21 @@
 
 CFLAGS= -fpic  -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86
-I../include  $(VMDEBUG)
 
+BUILDFILES = \
+	thread_copyright.o thrhelp.o thrspinlock.o hythread.o \
+	hythreadinspect.o linuxonexit.o priority.o rasthrsup.o rwmutex.o \
+	thrcreate.o thrdsup.o thrprof.o
 
-BUILDFILES1 = thread_copyright.o thrhelp.o thrspinlock.o hythread.o hythreadinspect.o
-BUILDFILES2 = linuxonexit.o priority.o rasthrsup.o rwmutex.o
-BUILDFILES3 = thrcreate.o thrdsup.o thrprof.o
+SYSLIBFILES = -lpthread
 
-SYSLIBFILES1 = -lpthread
+MDLLIBFILES = ../lib/libhypool.a ../lib/libhycommon.a
 
-MDLLIBFILES1 = ../lib/libhypool.a ../lib/libhycommon.a
+all: $(DLLNAME)
 
-all: \
-	 $(DLLNAME)
-
-$(DLLNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(MDLLIBFILES1) 
-	 $(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -L../lib -o $(DLLNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) $(SYSLIBFILES1) -Xlinker --start-group \
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) 
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -L../lib -o $(DLLNAME) \
+	$(BUILDFILES) $(SYSLIBFILES) -Xlinker --start-group \
 	-lhypool \
 	-lhycommon -Xlinker --end-group  -lc -lm -ldl
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile Tue Feb 21
06:58:41 2006
@@ -28,19 +28,17 @@
 
 CFLAGS= -fpic  -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86
-I../include $(VMDEBUG)
 
+BUILDFILES = vmi_copyright.o vmi.o
 
+MDLLIBFILES = ../lib/libhyzip.a ../lib/libhypool.a
 
-BUILDFILES1 = vmi_copyright.o vmi.o
+all: $(DLLNAME)
 
-MDLLIBFILES1 = ../lib/libhyzip.a ../lib/libhypool.a
-
-all: \
-	 $(DLLNAME)
-
-$(DLLNAME):\
-	$(BUILDFILES1) $(MDLLIBFILES1) 
-	 $(DLL_LD)  -shared  -Wl,-Map=$(LIBNAME).map  -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME)
$(VMLINK) -L.  -L../lib -L.. -o $(DLLNAME) \
-	$(BUILDFILES1) -Xlinker --start-group \
+$(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) 
+	$(DLL_LD)  -shared  -Wl,-Map=$(LIBNAME).map \
+	-Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) \
+	$(VMLINK) -L.  -L../lib -L.. -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group \
 	-lhyzip \
 	-lhypool -Xlinker --end-group  -lc -lm -ldl
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile Tue Feb 21
06:58:41 2006
@@ -22,17 +22,14 @@
 
 LIBPATH=../lib/# declaration
 
-BUILDFILES1 = zcpool.o zipalloc.o zipcache.o zipsup.o
+BUILDFILES = zcpool.o zipalloc.o zipcache.o zipsup.o
 
 CFLAGS= -DLINUX -D_REENTRANT -O1 -march=pentium3 -DIPv6_FUNCTION_SUPPORT  -DHYX86 -I../include
-I../zlib  $(VMDEBUG)
 
-
 all: $(LIBPATH)$(LIBNAME)
 
-$(LIBPATH)$(LIBNAME):\
-	$(BUILDFILES1) 
-	$(AR) rcv $(LIBPATH)$(LIBNAME) \
-	$(BUILDFILES1) 
+$(LIBPATH)$(LIBNAME): $(BUILDFILES)
+	$(AR) rcv $(LIBPATH)$(LIBNAME) $(BUILDFILES)
 
 clean:
 	-rm -f *.o

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile?rev=379471&r1=379470&r2=379471&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile Tue Feb
21 06:58:41 2006
@@ -29,17 +29,16 @@
 CFLAGS=-fpic -O1 -march=pentium3 -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -DHYX86  -I../include
-I.  $(VMDEBUG)
 
 
-BUILDFILES1 = zlib_copyright.o adler32.o compress.o crc32.o deflate.o
-BUILDFILES2 = infback.o inffast.o inflate.o inftrees.o trees.o
-BUILDFILES3 = uncompr.o zutil.o
+BUILDFILES = \
+	zlib_copyright.o adler32.o compress.o crc32.o deflate.o infback.o \
+	inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
 
-all: \
-	 $(DLLNAME)
+all: $(DLLNAME)
 
-$(DLLNAME):\
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) 
-	 $(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp -Wl,-soname=$(DLLFILENAME) $(VMLINK)
-L.  -o $(DLLNAME) \
-	$(BUILDFILES1) $(BUILDFILES2) $(BUILDFILES3) -Xlinker --start-group -Xlinker --end-group
 -lc -lm -ldl
+$(DLLNAME): $(BUILDFILES)
+	$(DLL_LD) -shared -Wl,--version-script,$(LIBNAME).exp \
+	-Wl,-soname=$(DLLFILENAME) $(VMLINK) -L.  -o $(DLLNAME) \
+	$(BUILDFILES) -Xlinker --start-group -Xlinker --end-group  -lc -lm -ldl
 
 clean:
 	-rm -f *.o



Mime
View raw message