harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r482379 - in /harmony/enhanced/classlib/trunk/modules/awt: build.xml src/main/native/oglwrapper/unix/makefile
Date Mon, 04 Dec 2006 21:50:29 GMT
Author: apetrenko
Date: Mon Dec  4 13:50:28 2006
New Revision: 482379

URL: http://svn.apache.org/viewvc?view=rev&rev=482379
Log:
Linux build fixed after HARMONY-2374 commit

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=482379&r1=482378&r2=482379
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Mon Dec  4 13:50:28 2006
@@ -163,8 +163,8 @@
                 <patternset includes="*${shlib.suffix}*" />
             </fileset>
         </copy>
-
-        <make dir="${hy.awt.src.main.native}/oglwrapper/${hy.os}" />
+	<echo message="${hy.awt.src.main.native}/oglwrapper/${hy.os.family}" />
+        <make dir="${hy.awt.src.main.native}/oglwrapper/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/oglwrapper">

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=482379&r1=482378&r2=482379
==============================================================================
--- 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
Dec  4 13:50:28 2006
@@ -1,31 +1,31 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(HY_HDK)/build/make/makefile.include
-
-CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include
-
-BUILDFILES = \
-  $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
-
-MDLLIBFILES = \
-	$(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++
-
-DLLNAME=../liboglwrapper.so
-
-include $(HY_HDK)/build/make/rules.mk
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include $(HY_HDK)/build/make/defines.mk
+
+CFLAGS += -fpic -I$(SHARED)common -I$(SHAREDSUB)/include
+
+BUILDFILES = \
+  $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
+
+MDLLIBFILES = \
+	$(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++
+
+DLLNAME=../liboglwrapper.so
+
+include $(HY_HDK)/build/make/rules.mk



Mime
View raw message