From 4468d2addb49c1ac5351d296544688d1d825087c Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Wed, 4 Jul 2001 13:39:04 +0000 Subject: [PATCH] Added support for ADDITIONAL_CLASSPATH and xxx_CLASSPATH git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@10288 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 11 +++++++++++ common.make | 7 ------- rules.make | 16 ++++++++++------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e49a7340..54a8bc53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Wed Jul 4 14:37:36 2001 Nicola Pero + + * common.make (INTERNAL_JAVACFLAGS, INTERNAL_JAVAHFLAGS): + Removed. + * rules.make (INTERNAL_CLASSPATHFLAGS): New flags; add + ADDITIONAL_CLASSPATH to the -classpath option as well. + (ALL_JAVACFLAGS, ALL_JAVAHFLAGS): Use INTERNAL_CLASSPATHFLAGS + rather than INTERNAL_JAVACFLAGS and INTERNAL_JAVAHFLAGS. + (ALL_JAVADOCFLAGS): Added INTERNAL_CLASSPATHFLAGS. + (%.build): Pass ADDITIONAL_CLASSPATH to subprocesses. + Fri Jun 29 14:53:51 2001 Nicola Pero * Documentation/.latex2html-init: New file. diff --git a/common.make b/common.make index f650982a..0bdcec13 100644 --- a/common.make +++ b/common.make @@ -541,13 +541,6 @@ ifeq ($(JAVADOC),) JAVADOC = $(JAVA_HOME)/bin/javadoc endif -# -# Flags useful for compilation -# -INTERNAL_JAVACFLAGS = -classpath ./:$(CLASSPATH) -INTERNAL_JAVAHFLAGS = -classpath ./:$(CLASSPATH) -#INTERNAL_JAVADOCFLAGS = - ## Local variables: ## mode: makefile ## End: diff --git a/rules.make b/rules.make index 2696d4e4..52a79b14 100644 --- a/rules.make +++ b/rules.make @@ -170,14 +170,16 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \ $(GNUSTEP_LOCAL_HEADERS_FLAG) $(GNUSTEP_NETWORK_HEADERS_FLAG) \ -I$(GNUSTEP_SYSTEM_HEADERS) -ALL_JAVACFLAGS = $(INTERNAL_JAVACFLAGS) $(ADDITIONAL_JAVACFLAGS) \ - $(AUXILIARY_JAVACFLAGS) +INTERNAL_CLASSPATHFLAGS = -classpath ./:$(CLASSPATH):$(strip $(ADDITIONAL_CLASSPATH)) -ALL_JAVAHFLAGS = $(INTERNAL_JAVAHFLAGS) $(ADDITIONAL_JAVAHFLAGS) \ - $(AUXILIARY_JAVAHFLAGS) +ALL_JAVACFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(ADDITIONAL_JAVACFLAGS) \ +$(AUXILIARY_JAVACFLAGS) -ALL_JAVADOCFLAGS = $(INTERNAL_JAVADOCFLAGS) $(ADDITIONAL_JAVADOCFLAGS) \ - $(AUXILIARY_JAVADOCFLAGS) +ALL_JAVAHFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(ADDITIONAL_JAVAHFLAGS) \ +$(AUXILIARY_JAVAHFLAGS) + +ALL_JAVADOCFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(ADDITIONAL_JAVADOCFLAGS) \ +$(AUXILIARY_JAVADOCFLAGS) ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \ $(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS) @@ -285,6 +287,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m ADDITIONAL_LIBRARY_LIBS="$($*_LIBS) $($*_LIBRARY_LIBS) $(ADDITIONAL_LIBRARY_LIBS)" \ ADDITIONAL_LIB_DIRS="$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS)" \ ADDITIONAL_LDFLAGS="$($*_LDFLAGS) $(ADDITIONAL_LDFLAGS)" \ + ADDITIONAL_CLASSPATH="$($*_CLASSPATH) $(ADDITIONAL_CLASSPATH)" \ LIBRARIES_DEPEND_UPON="$(shell $(WHICH_LIB_SCRIPT) \ $($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) $(ALL_LIB_DIRS) \ $(LIBRARIES_DEPEND_UPON) \ @@ -387,6 +390,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m ADDITIONAL_LIBRARY_LIBS="$($*_LIBS) $($*_LIBRARY_LIBS) $(ADDITIONAL_LIBRARY_LIBS)" \ ADDITIONAL_LIB_DIRS="$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS)" \ ADDITIONAL_LDFLAGS="$($*_LDFLAGS) $(ADDITIONAL_LDFLAGS)" \ + ADDITIONAL_CLASSPATH="$($*_CLASSPATH) $(ADDITIONAL_CLASSPATH)" \ LIBRARIES_DEPEND_UPON="$(shell $(WHICH_LIB_SCRIPT) \ $($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) $(ALL_LIB_DIRS) \ $(LIBRARIES_DEPEND_UPON) \