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/17 10:46:05 UTC
svn commit: r496978 - in /harmony/enhanced/classlib/trunk: depends/build/
modules/awt/src/main/native/jpegdecoder/unix/
modules/awt/src/main/native/jpegdecoder/windows/
modules/imageio/src/main/native/jpegencoder/unix/
modules/imageio/src/main/native/j...
Author: hindessm
Date: Wed Jan 17 01:46:04 2007
New Revision: 496978
URL: http://svn.apache.org/viewvc?view=rev&rev=496978
Log:
Minor fix to native clean targets.
Modified:
harmony/enhanced/classlib/trunk/depends/build/rules.mak
harmony/enhanced/classlib/trunk/depends/build/rules.mk
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mak?view=diff&rev=496978&r1=496977&r2=496978
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mak Wed Jan 17 01:46:04 2007
@@ -56,4 +56,5 @@
-del $(BUILDFILES) *.res *.pdb \
$(LIBNAME) $(LIBNAME:.lib=.exp) \
$(DLLNAME) $(DLLNAME:.dll=.pdb) $(DLLNAME:.dll=.map) \
- $(EXENAME) $(EXENAME:.exe=.pdb) >nul 2>&1
+ $(EXENAME) $(EXENAME:.exe=.pdb) \
+ $(CLEANFILES) >nul 2>&1
Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?view=diff&rev=496978&r1=496977&r2=496978
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Wed Jan 17 01:46:04 2007
@@ -42,4 +42,4 @@
-Xlinker -rpath-link -Xlinker $(HY_HDK)/jdk/jre/bin
clean:
- -rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME)
+ -rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME) $(CLEANFILES)
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile?view=diff&rev=496978&r1=496977&r2=496978
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile Wed Jan 17 01:46:04 2007
@@ -30,6 +30,8 @@
DLLNAME=../libjpegdecoder.so
+CLEANFILES=jconfig.h
+
include $(HY_HDK)/build/make/rules.mk
$(SHAREDSUB)JpegDecoder.o: jconfig.h
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile?view=diff&rev=496978&r1=496977&r2=496978
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile Wed Jan 17 01:46:04 2007
@@ -36,6 +36,8 @@
DLLBASE=0x13300000
COMMENT=/comment:"JPEGDECODER native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+CLEANFILES=jconfig.h
+
!include <$(HY_HDK)\build\make\rules.mak>
$(SHAREDSUB)JpegDecoder.obj: jconfig.h
Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile?view=diff&rev=496978&r1=496977&r2=496978
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile Wed Jan 17 01:46:04 2007
@@ -30,6 +30,8 @@
DLLNAME=../libjpegencoder.so
+CLEANFILES=jconfig.h
+
include $(HY_HDK)/build/make/rules.mk
$(SHAREDSUB)JpegEncoder.o: jconfig.h
Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile?view=diff&rev=496978&r1=496977&r2=496978
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile Wed Jan 17 01:46:04 2007
@@ -43,6 +43,8 @@
DLLBASE=0x13300000
COMMENT=/comment:"JPEGENCODER native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+CLEANFILES=jconfig.h
+
!include <$(HY_HDK)\build\make\rules.mak>
$(SHAREDSUB)JpegEncoder.obj: jconfig.h