[kaffe] CVS kaffe (robilad): Avoid generating unused headers
Kaffe CVS
cvs-commits at kaffe.org
Sat Jan 29 04:21:37 PST 2005
PatchSet 5935
Date: 2005/01/29 12:17:29
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Avoid generating unused headers
2005-01-29 Dalibor Topic <robilad at kaffe.org>
* include/Makefile.am (NOINSTALL_JNI_DERIVED_HDRS): Only create
classpath AWT, alsa, esd or libxmlj headers if the native libraries
for them should be built.
Reported by: Nektarios K. Papadopoulos <npapadop at inaccessnetworks.com>
Members:
ChangeLog:1.3474->1.3475
include/Makefile.am:1.86->1.87
include/Makefile.in:1.208->1.209
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3474 kaffe/ChangeLog:1.3475
--- kaffe/ChangeLog:1.3474 Fri Jan 28 15:30:56 2005
+++ kaffe/ChangeLog Sat Jan 29 12:17:29 2005
@@ -1,3 +1,11 @@
+2005-01-29 Dalibor Topic <robilad at kaffe.org>
+
+ * include/Makefile.am (NOINSTALL_JNI_DERIVED_HDRS): Only create
+ classpath AWT, alsa, esd or libxmlj headers if the native libraries
+ for them should be built.
+
+ Reported by: Nektarios K. Papadopoulos <npapadop at inaccessnetworks.com>
+
2005-01-28 Dalibor Topic <robilad at kaffe.org>
* configure.ac: Added COND_NATIVE_SOUND conditional.
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.86 kaffe/include/Makefile.am:1.87
--- kaffe/include/Makefile.am:1.86 Sun Jan 23 18:48:37 2005
+++ kaffe/include/Makefile.am Sat Jan 29 12:17:33 2005
@@ -191,6 +191,27 @@
gnu_java_awt_peer_gtk_GtkWindowPeer.h \
gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
+# Only create headers for AWT, Sound and libxmlj if they are going to be built.
+
+if COND_LIBXMLJ
+ MAYBE_LIBXMLJ_JNI_HDRS = $(LIBXMLJ_JNI_HDRS)
+endif
+
+if COND_NATIVE_SOUND
+if COND_SOUND_ALSA
+ MAYBE_LIBTRITONUSALSA_JNI_HDRS = $(LIBTRITONUSALSA_JNI_HDRS)
+endif
+if COND_SOUND_ESD
+ MAYBE_LIBTRITONUSESD_JNI_HDRS = $(LIBTRITONUSESD_JNI_HDRS)
+endif
+endif
+
+if COND_NATIVE_AWT
+if COND_CLASSPATH_GTK_AWT
+ MAYBE_LIBGTKPEER_JNI_HDRS = $(LIBGTKPEER_JNI_HDRS)
+endif
+endif
+
NOINSTALL_JNI_DERIVED_HDRS = \
java_math_BigInteger.h \
gnu_classpath_VMSystemProperties.h \
@@ -213,10 +234,10 @@
kaffe_security_provider_MD4.h \
kaffe_security_provider_MD5.h \
kaffe_security_provider_SHA.h \
- $(LIBTRITONUSALSA_JNI_HDRS) \
- $(LIBTRITONUSESD_JNI_HDRS) \
- $(LIBXMLJ_JNI_HDRS) \
- $(LIBGTKPEER_JNI_HDRS)
+ $(MAYBE_LIBTRITONUSALSA_JNI_HDRS) \
+ $(MAYBE_LIBTRITONUSESD_JNI_HDRS) \
+ $(MAYBE_LIBXMLJ_JNI_HDRS) \
+ $(MAYBE_LIBGTKPEER_JNI_HDRS)
JNI_DERIVED_HDRS = \
$(INSTALL_JNI_DERIVED_HDRS) \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.208 kaffe/include/Makefile.in:1.209
--- kaffe/include/Makefile.in:1.208 Fri Jan 28 15:31:05 2005
+++ kaffe/include/Makefile.in Sat Jan 29 12:17:33 2005
@@ -548,6 +548,12 @@
gnu_java_awt_peer_gtk_GtkWindowPeer.h \
gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
+
+# Only create headers for AWT, Sound and libxmlj if they are going to be built.
+ at COND_LIBXMLJ_TRUE@MAYBE_LIBXMLJ_JNI_HDRS = $(LIBXMLJ_JNI_HDRS)
+ at COND_NATIVE_SOUND_TRUE@@COND_SOUND_ALSA_TRUE at MAYBE_LIBTRITONUSALSA_JNI_HDRS = $(LIBTRITONUSALSA_JNI_HDRS)
+ at COND_NATIVE_SOUND_TRUE@@COND_SOUND_ESD_TRUE at MAYBE_LIBTRITONUSESD_JNI_HDRS = $(LIBTRITONUSESD_JNI_HDRS)
+ at COND_CLASSPATH_GTK_AWT_TRUE@@COND_NATIVE_AWT_TRUE at MAYBE_LIBGTKPEER_JNI_HDRS = $(LIBGTKPEER_JNI_HDRS)
NOINSTALL_JNI_DERIVED_HDRS = \
java_math_BigInteger.h \
gnu_classpath_VMSystemProperties.h \
@@ -570,10 +576,10 @@
kaffe_security_provider_MD4.h \
kaffe_security_provider_MD5.h \
kaffe_security_provider_SHA.h \
- $(LIBTRITONUSALSA_JNI_HDRS) \
- $(LIBTRITONUSESD_JNI_HDRS) \
- $(LIBXMLJ_JNI_HDRS) \
- $(LIBGTKPEER_JNI_HDRS)
+ $(MAYBE_LIBTRITONUSALSA_JNI_HDRS) \
+ $(MAYBE_LIBTRITONUSESD_JNI_HDRS) \
+ $(MAYBE_LIBXMLJ_JNI_HDRS) \
+ $(MAYBE_LIBGTKPEER_JNI_HDRS)
JNI_DERIVED_HDRS = \
$(INSTALL_JNI_DERIVED_HDRS) \
More information about the kaffe
mailing list