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 2006/11/29 11:06:22 UTC
svn commit: r480506 - in /harmony/enhanced/classlib/trunk: depends/build/
modules/archive/src/main/native/archive/linux/
modules/archive/src/main/native/zip/linux/
modules/archive/src/main/native/zlib/linux/
modules/auth/src/main/native/auth/linux/ mod...
Author: hindessm
Date: Wed Nov 29 02:06:16 2006
New Revision: 480506
URL: http://svn.apache.org/viewvc?view=rev&rev=480506
Log:
Renaming makefile.include to defines.mk for consistency.
Added:
harmony/enhanced/classlib/trunk/depends/build/defines.mk
- copied unchanged from r480068, harmony/enhanced/classlib/trunk/depends/build/makefile.include
Removed:
harmony/enhanced/classlib/trunk/depends/build/makefile.include
Modified:
harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile
harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile
harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile
harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile
harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/linux/makefile
harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/linux/makefile
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/linux/makefile
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/makefile
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/linux/makefile
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/makefile
harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'archive'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic -I$(SHARED)common -I../../zlib_dist \
-I../../include/shared
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'zip'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic -I../../zlib_dist
BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'zlib'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
ZLIB_DIST=../../zlib_dist/# Path to zlib
Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'auth'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/makefile Wed Nov 29 02:06:16 2006
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
PNG_DIR=$(HY_HDK)/../depends/libs/build/png
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/makefile Wed Nov 29 02:06:16 2006
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/makefile Wed Nov 29 02:06:16 2006
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
LCMS_DIR=$(HY_HDK)/../depends/libs/build/lcms
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile Wed Nov 29 02:06:16 2006
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic -I$(SHARED)common \
-I/usr/X11R6/include -I/usr/include/freetype2 \
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile Wed Nov 29 02:06:16 2006
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic -I$(SHARED)common -I/usr/X11R6/include
Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/makefile Wed Nov 29 02:06:16 2006
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'instrument'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'fdlibm'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
FDLIBM_DIST=../../fdlibm_dist/
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for 'launcher'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'luni'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
# CFLAGS += -fpic -Wall -Werror
CFLAGS += -fpic -Wall
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'vmi stubs'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'common'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -I../../include/shared -I../../include/linux
BUILDFILES = $(SHAREDSUB)vmls.o
Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/linux/makefile Wed Nov 29 02:06:16 2006
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic -I$(SHARED)common
Modified: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'nio'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'common'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
BUILDFILES = $(SHAREDSUB)libglob.o $(SHAREDSUB)iohelp.o \
$(SHAREDSUB)exceptions.o $(SHAREDSUB)strhelp.o \
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'pool'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
BUILDFILES = $(SHAREDSUB)pool.o $(SHAREDSUB)pool_cap.o
LIBNAME = $(LIBPATH)libhypool.a
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'port'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic -DHYPORT_LIBRARY_DEFINE
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'hysig'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)hysig_copyright.o hysiglinux.o hysigunix.o
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'thread'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic
Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile?view=diff&rev=480506&r1=480505&r2=480506
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/makefile Wed Nov 29 02:06:16 2006
@@ -17,7 +17,7 @@
# Makefile for module 'text'
#
-include $(HY_HDK)/build/make/makefile.include
+include $(HY_HDK)/build/make/defines.mk
CFLAGS += -fpic -I../../icu4c
BUILDFILES = $(SHAREDSUB)text_copyright.o $(SHAREDSUB)BidiWrapper.o