summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2004-02-04 08:21:59 +0000
committerMichael Koch <konqueror@gmx.de>2004-02-04 08:21:59 +0000
commit68851f63e08875b957870934fc77ae36ab2a8b66 (patch)
tree453077465cf7eda3d4042c1a33468b5f371c5414 /lib
parent5995e80885120bfd87751d3d7ed99bc8a0eac64f (diff)
downloadclasspath-68851f63e08875b957870934fc77ae36ab2a8b66.tar.gz
2004-02-04 Michael Koch <konqueror@gmx.de>
* configure.ac: No need to call AC_PROG_MAKE_SET explicitely. Define conditiional for building glibj.zip. Simplified GTK checks. * lib/Makefile.am: Build glibj.zip conditionally. * native/jni/gtk-peer/Makefile.am: Removed references of GTHREAD_* and LIBART_*, all is now in GTK_*.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 655905ffa..8b98ee11e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -72,7 +72,7 @@ ARG_CLASSPATH_JAVAH = -classpath
JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB)
-
+if BUILD_GLIBJ_ZIP
if HAVE_ZIP
dist_pkgdata_DATA = glibj.zip
noinst_DATA = genclasses
@@ -94,6 +94,8 @@ uninstall-local:
rm -rf $(DESTDIR)$(pkgdatadir)/javax
rm -rf $(DESTDIR)$(pkgdatadir)/org
+endif # BUILD_GLIBJ_ZIP
+
.PHONY: genclasses
glibj.zip: classes compile-classes resources