gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small rewrite for efficiency

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14644 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-10-04 13:56:01 +00:00
parent 81939f45c5
commit d329c3b6b7
4 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Fri Oct 4 14:45:53 2002 Nicola Pero <n.pero@mi.flashnet.it>
* configure.ac (clean_target_os, clean_target_cpu,
clean_target_vendor): New variables: compute them, and subst them
in the generated files.
* GNUmakefile.in (GNUSTEP_TARGET_CPU, GNUSTEP_TARGET_OS,
GNUSTEP_TARGET_VENDOR): Just set to be clean_target_cpu,
clean_target_os, clean_target_vendor.
(VERTAG): Compute efficiently.
* configure: Regenerated
2002-10-01 Richard Frith-Macdonald <rfm@gnu.org>
* Instance/documentation.make: commented out bogus extra running

16
GNUmakefile.in
View file

@ -43,16 +43,12 @@ libdir = @libdir@
includedir = @includedir@
datadir = @datadir@
GNUSTEP_FLATTENED := @GNUSTEP_FLATTENED@
GNUSTEP_TARGET_CPU := @target_cpu@
GNUSTEP_TARGET_OS := @target_os@
GNUSTEP_TARGET_VENDOR := @target_vendor@
GNUSTEP_FLATTENED = @GNUSTEP_FLATTENED@
GNUSTEP_TARGET_CPU = @clean_target_cpu@
GNUSTEP_TARGET_VENDOR = @clean_target_vendor@
GNUSTEP_TARGET_OS = @clean_target_os@
GNUSTEP_TARGET_CPU := $(shell $(srcdir)/clean_cpu.sh $(GNUSTEP_TARGET_CPU))
GNUSTEP_TARGET_VENDOR := $(shell $(srcdir)/clean_vendor.sh $(GNUSTEP_TARGET_VENDOR))
GNUSTEP_TARGET_OS := $(shell $(srcdir)/clean_os.sh $(GNUSTEP_TARGET_OS))
GNUSTEP_LIB_COMBO := @ac_cv_library_combo@
GNUSTEP_LIB_COMBO = @ac_cv_library_combo@
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
@ -70,7 +66,7 @@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
VERTAG = `echo $(GNUSTEP_MAKE_VERSION) | tr '.' '_'`
VERTAG = $(subst .,_,$(GNUSTEP_MAKE_VERSION))
MAKE_FILES = aggregate.make application.make bundle.make service.make \
common.make library-combo.make java.make jni.make library.make \

18
configure vendored
View file

@ -4064,6 +4064,21 @@ echo "${ECHO_T}$GNUSTEP_MAKE_VERSION" >&6
#-------------------------------------------------------------------
# Record the 'clean' target_os, target_cpu and target_vendor
#-------------------------------------------------------------------
# This is just for efficiency, so that core/make/GNUmakefile does not
# have to compute clean_target_os from target_os (and similar) by
# running shell scripts each time you 'make' something inside
# gnustep-make. We basically compute them once now, and cache them
# forever.
clean_target_os=`$srcdir/clean_os.sh $target_os`
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
clean_target_vendor=`$srcdir/clean_cpu.sh $target_vendor`
#--------------------------------------------------------------------
# Produce the output files
#--------------------------------------------------------------------
@ -4696,6 +4711,9 @@ s,@GNUSTEP_MAKE_VERSION@,$GNUSTEP_MAKE_VERSION,;t t
s,@GNUSTEP_MAKE_MAJOR_VERSION@,$GNUSTEP_MAKE_MAJOR_VERSION,;t t
s,@GNUSTEP_MAKE_MINOR_VERSION@,$GNUSTEP_MAKE_MINOR_VERSION,;t t
s,@GNUSTEP_MAKE_SUBMINOR_VERSION@,$GNUSTEP_MAKE_SUBMINOR_VERSION,;t t
s,@clean_target_os@,$clean_target_os,;t t
s,@clean_target_cpu@,$clean_target_cpu,;t t
s,@clean_target_vendor@,$clean_target_vendor,;t t
CEOF
_ACEOF

15
configure.ac
View file

@ -447,6 +447,21 @@ AC_SUBST(GNUSTEP_MAKE_MAJOR_VERSION)
AC_SUBST(GNUSTEP_MAKE_MINOR_VERSION)
AC_SUBST(GNUSTEP_MAKE_SUBMINOR_VERSION)
#-------------------------------------------------------------------
# Record the 'clean' target_os, target_cpu and target_vendor
#-------------------------------------------------------------------
# This is just for efficiency, so that core/make/GNUmakefile does not
# have to compute clean_target_os from target_os (and similar) by
# running shell scripts each time you 'make' something inside
# gnustep-make. We basically compute them once now, and cache them
# forever.
clean_target_os=`$srcdir/clean_os.sh $target_os`
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
clean_target_vendor=`$srcdir/clean_cpu.sh $target_vendor`
AC_SUBST(clean_target_os)
AC_SUBST(clean_target_cpu)
AC_SUBST(clean_target_vendor)
#--------------------------------------------------------------------
# Produce the output files
#--------------------------------------------------------------------