gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-05-06 03:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support for ADDITIONAL_CLASSPATH and xxx_CLASSPATH

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@10288 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-07-04 13:39:04 +00:00
parent c49acf18ac
commit 4468d2addb
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Wed Jul 4 14:37:36 2001 Nicola Pero <nicola@brainstorm.co.uk>
* 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 <nicola@brainstorm.co.uk> Fri Jun 29 14:53:51 2001 Nicola Pero <nicola@brainstorm.co.uk>
* Documentation/.latex2html-init: New file. * Documentation/.latex2html-init: New file.

7
common.make
View file

@ -541,13 +541,6 @@ ifeq ($(JAVADOC),)
JAVADOC = $(JAVA_HOME)/bin/javadoc JAVADOC = $(JAVA_HOME)/bin/javadoc
endif endif
#
# Flags useful for compilation
#
INTERNAL_JAVACFLAGS = -classpath ./:$(CLASSPATH)
INTERNAL_JAVAHFLAGS = -classpath ./:$(CLASSPATH)
#INTERNAL_JAVADOCFLAGS =
## Local variables: ## Local variables:
## mode: makefile ## mode: makefile
## End: ## End:

10
rules.make
View file

@ -170,13 +170,15 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
$(GNUSTEP_LOCAL_HEADERS_FLAG) $(GNUSTEP_NETWORK_HEADERS_FLAG) \ $(GNUSTEP_LOCAL_HEADERS_FLAG) $(GNUSTEP_NETWORK_HEADERS_FLAG) \
-I$(GNUSTEP_SYSTEM_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
ALL_JAVACFLAGS = $(INTERNAL_JAVACFLAGS) $(ADDITIONAL_JAVACFLAGS) \ INTERNAL_CLASSPATHFLAGS = -classpath ./:$(CLASSPATH):$(strip $(ADDITIONAL_CLASSPATH))
ALL_JAVACFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(ADDITIONAL_JAVACFLAGS) \
$(AUXILIARY_JAVACFLAGS) $(AUXILIARY_JAVACFLAGS)
ALL_JAVAHFLAGS = $(INTERNAL_JAVAHFLAGS) $(ADDITIONAL_JAVAHFLAGS) \ ALL_JAVAHFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(ADDITIONAL_JAVAHFLAGS) \
$(AUXILIARY_JAVAHFLAGS) $(AUXILIARY_JAVAHFLAGS)
ALL_JAVADOCFLAGS = $(INTERNAL_JAVADOCFLAGS) $(ADDITIONAL_JAVADOCFLAGS) \ ALL_JAVADOCFLAGS = $(INTERNAL_CLASSPATHFLAGS) $(ADDITIONAL_JAVADOCFLAGS) \
$(AUXILIARY_JAVADOCFLAGS) $(AUXILIARY_JAVADOCFLAGS)
ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \ ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
@ -285,6 +287,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
ADDITIONAL_LIBRARY_LIBS="$($*_LIBS) $($*_LIBRARY_LIBS) $(ADDITIONAL_LIBRARY_LIBS)" \ ADDITIONAL_LIBRARY_LIBS="$($*_LIBS) $($*_LIBRARY_LIBS) $(ADDITIONAL_LIBRARY_LIBS)" \
ADDITIONAL_LIB_DIRS="$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS)" \ ADDITIONAL_LIB_DIRS="$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS)" \
ADDITIONAL_LDFLAGS="$($*_LDFLAGS) $(ADDITIONAL_LDFLAGS)" \ ADDITIONAL_LDFLAGS="$($*_LDFLAGS) $(ADDITIONAL_LDFLAGS)" \
ADDITIONAL_CLASSPATH="$($*_CLASSPATH) $(ADDITIONAL_CLASSPATH)" \
LIBRARIES_DEPEND_UPON="$(shell $(WHICH_LIB_SCRIPT) \ LIBRARIES_DEPEND_UPON="$(shell $(WHICH_LIB_SCRIPT) \
$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) $(ALL_LIB_DIRS) \ $($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) $(ALL_LIB_DIRS) \
$(LIBRARIES_DEPEND_UPON) \ $(LIBRARIES_DEPEND_UPON) \
@ -387,6 +390,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
ADDITIONAL_LIBRARY_LIBS="$($*_LIBS) $($*_LIBRARY_LIBS) $(ADDITIONAL_LIBRARY_LIBS)" \ ADDITIONAL_LIBRARY_LIBS="$($*_LIBS) $($*_LIBRARY_LIBS) $(ADDITIONAL_LIBRARY_LIBS)" \
ADDITIONAL_LIB_DIRS="$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS)" \ ADDITIONAL_LIB_DIRS="$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS)" \
ADDITIONAL_LDFLAGS="$($*_LDFLAGS) $(ADDITIONAL_LDFLAGS)" \ ADDITIONAL_LDFLAGS="$($*_LDFLAGS) $(ADDITIONAL_LDFLAGS)" \
ADDITIONAL_CLASSPATH="$($*_CLASSPATH) $(ADDITIONAL_CLASSPATH)" \
LIBRARIES_DEPEND_UPON="$(shell $(WHICH_LIB_SCRIPT) \ LIBRARIES_DEPEND_UPON="$(shell $(WHICH_LIB_SCRIPT) \
$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) $(ALL_LIB_DIRS) \ $($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS) $(ALL_LIB_DIRS) \
$(LIBRARIES_DEPEND_UPON) \ $(LIBRARIES_DEPEND_UPON) \