mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Extended gnustep-config to be able to print out compile/link flags. Added quiet=yes option to silent the gnustep-make version message
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24616 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
bc40e45feb
commit
2aa566c1ee
7 changed files with 65 additions and 7 deletions
17
ChangeLog
17
ChangeLog
|
@ -1,3 +1,20 @@
|
|||
2007-02-17 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* common.make: Added new flag quiet=yes that disables the
|
||||
gnustep-make version message.
|
||||
|
||||
* configure.ac: Output GNUMAKE value.
|
||||
* configure: Regenerated.
|
||||
* empty.make: New file.
|
||||
* GNUmakefile.in: Install it.
|
||||
* rules.make (print-gnustep-make-objc-flags,
|
||||
print-gnustep-make-objc-libs,
|
||||
print-gnustep-make-base-libs,
|
||||
print-gnustep-make-gui-libs): New targets.
|
||||
* gnustep-config.in: New options --objc-flags, --objc-libs,
|
||||
--base-libs, --gui-libs that output the flags used for basic ObjC
|
||||
compilation and linking on the current platform.
|
||||
|
||||
2007-02-16 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Added GNUSTEP_ADMIN_APPS and GNUSTEP_ADMIN_TOOLS.
|
||||
|
|
|
@ -77,7 +77,7 @@ VERTAG = $(subst .,_,$(GNUSTEP_MAKE_VERSION))
|
|||
SVNPREFIX=svn+ssh://svn.gna.org/svn/gnustep/tools/make
|
||||
|
||||
MAKE_FILES = aggregate.make application.make bundle.make service.make \
|
||||
common.make filesystem.make library-combo.make java.make jni.make library.make \
|
||||
common.make empty.make filesystem.make library-combo.make java.make jni.make library.make \
|
||||
messages.make rules.make target.make names.make resource-set.make \
|
||||
tool.make ctool.make test-library.make \
|
||||
objc.make test-application.make test-tool.make subproject.make \
|
||||
|
|
|
@ -673,7 +673,10 @@ ifeq ($(_GNUSTEP_TOP_INVOCATION_DONE),)
|
|||
# Print out a message with our version number and how to get help on
|
||||
# targets and options.
|
||||
ifeq ($(MAKE_WITH_INFO_FUNCTION),yes)
|
||||
$(info This is gnustep-make $(GNUSTEP_MAKE_VERSION). Type 'make print-gnustep-make-help' for help.)
|
||||
# Use 'make quiet=yes' to disable the message
|
||||
ifneq ($(quiet),yes)
|
||||
$(info This is gnustep-make $(GNUSTEP_MAKE_VERSION). Type 'make print-gnustep-make-help' for help.)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Sanity check on $PATH - NB: if PATH is wrong, we can't do certain
|
||||
|
|
4
configure
vendored
4
configure
vendored
|
@ -4630,6 +4630,10 @@ done
|
|||
test -n "$GNUMAKE" || GNUMAKE="make"
|
||||
|
||||
|
||||
# Used by gnustep-config to launch gnustep-make to compute
|
||||
# compilation/link flags
|
||||
|
||||
|
||||
# If GNU make supports $(info ...), gnustep-make can use it to print
|
||||
# out a help message at the beginning of each compilation. This
|
||||
# feature was introduced in GNU make 3.81, so we check GNU make's
|
||||
|
|
|
@ -1130,6 +1130,10 @@ AC_SUBST(OBJCFLAGS)
|
|||
# on.
|
||||
AC_CHECK_PROGS(GNUMAKE, [gmake gnumake make], make)
|
||||
|
||||
# Used by gnustep-config to launch gnustep-make to compute
|
||||
# compilation/link flags
|
||||
AC_SUBST(GNUMAKE)
|
||||
|
||||
# If GNU make supports $(info ...), gnustep-make can use it to print
|
||||
# out a help message at the beginning of each compilation. This
|
||||
# feature was introduced in GNU make 3.81, so we check GNU make's
|
||||
|
|
|
@ -107,13 +107,24 @@ if [ -z "$GNUSTEP_MAKEFILES" ]; then
|
|||
GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
|
||||
fi
|
||||
|
||||
export GNUSTEP_MAKEFILES
|
||||
|
||||
#
|
||||
# If all they want to know if GNUSTEP_MAKEFILES, we can print it out
|
||||
# If all they want to know if GNUSTEP_MAKEFILES or anything that
|
||||
# we can compute only using GNUSTEP_MAKEFILES, we can print it ou
|
||||
#
|
||||
if [ "$1" == "GNUSTEP_MAKEFILES" ]; then
|
||||
echo "$GNUSTEP_MAKEFILES"
|
||||
exit 0
|
||||
fi
|
||||
case "$1" in
|
||||
GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES"
|
||||
exit 0;;
|
||||
--objc-flags) @GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes
|
||||
exit 0;;
|
||||
--objc-libs) @GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-libs quiet=yes
|
||||
exit 0;;
|
||||
--base-libs) @GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-base-libs quiet=yes
|
||||
exit 0;;
|
||||
--gui-libs) @GNUMAKE@ -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-gui-libs quiet=yes
|
||||
exit 0;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Else, now read all the standard GNUstep config
|
||||
|
|
19
rules.make
19
rules.make
|
@ -661,5 +661,24 @@ $(GNUSTEP_OBJ_DIR):
|
|||
print-gnustep-make-help:
|
||||
@(cat $(GNUSTEP_MAKEFILES)/gnustep-make-help | sed -e '/^#.*/d')
|
||||
|
||||
# These targets are used by gnustep-config to allow people to get
|
||||
# basic compilation/link flags for GNUstep ObjC code.
|
||||
|
||||
# Flags used when compiling ObjC
|
||||
print-gnustep-make-objc-flags:
|
||||
@(echo $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS))
|
||||
|
||||
# Flags used when linking against libobjc only
|
||||
print-gnustep-make-objc-libs:
|
||||
@(echo $(ALL_LDFLAGS) $(CC_LDFLAGS) $(ALL_LIB_DIRS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) $(TARGET_SYSTEM_LIBS))
|
||||
|
||||
# Flags used when linking against Foundation
|
||||
print-gnustep-make-base-libs:
|
||||
@(echo $(ALL_LDFLAGS) $(CC_LDFLAGS) $(ALL_LIB_DIRS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) $(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) $(TARGET_SYSTEM_LIBS))
|
||||
|
||||
# Flags used when linking against Foundation and GUI
|
||||
print-gnustep-make-gui-libs:
|
||||
@(echo $(ALL_LDFLAGS) $(CC_LDFLAGS) $(ALL_LIB_DIRS) $(ADDITIONAL_GUI_LIBS) $(AUXILIARY_GUI_LIBS) $(GUI_LIBS) $(BACKEND_LIBS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) $(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS))
|
||||
|
||||
endif
|
||||
# rules.make loaded
|
||||
|
|
Loading…
Reference in a new issue