Removed some unusual make syntax in favour of the standard one we use everywhere

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@27714 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2009-01-28 22:33:02 +00:00
parent cd1af94aee
commit 5d1905c5f3
2 changed files with 16 additions and 11 deletions

View file

@ -1,3 +1,8 @@
2009-01-28 Nicola Pero <nicola.pero@meta-innovation.com>
* rules.make: Replaced ${OEXT} with the equivalent syntax $(OEXT)
to be consistent with the rest of the code.
2009-01-25 Adam Fedor <fedor@gnu.org>
* configure.ac: Add PATH to custom objc library on MinGW (Fix

View file

@ -366,7 +366,7 @@ VPATH = .
# Then define our own.
.SUFFIXES: .m .c .psw .java .h .cpp .cxx .C .cc .cp .mm
.PRECIOUS: %.c %.h $(GNUSTEP_OBJ_DIR)/%${OEXT}
.PRECIOUS: %.c %.h $(GNUSTEP_OBJ_DIR)/%$(OEXT)
# Disable all built-in rules with a vague % as target, for performance.
%: %.c
@ -422,54 +422,54 @@ VPATH = .
# as well, so the following rule is simply equivalent to
# $(CC) $< -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -o $@
# and similarly all the rules below
$(GNUSTEP_OBJ_DIR)/%.c${OEXT} : %.c
$(GNUSTEP_OBJ_DIR)/%.c$(OEXT) : %.c
$(ECHO_COMPILING)$(CC) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS)) \
$($<_FILE_FLAGS) -o $@$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/%.m${OEXT} : %.m
$(GNUSTEP_OBJ_DIR)/%.m$(OEXT) : %.m
$(ECHO_COMPILING)$(CC) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_OBJCFLAGS)) \
$($<_FILE_FLAGS) -o $@$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/%.C${OEXT} : %.C
$(GNUSTEP_OBJ_DIR)/%.C$(OEXT) : %.C
$(ECHO_COMPILING)$(CXX) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
$($<_FILE_FLAGS) -o $@$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/%.cc${OEXT} : %.cc
$(GNUSTEP_OBJ_DIR)/%.cc$(OEXT) : %.cc
$(ECHO_COMPILING)$(CXX) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
$($<_FILE_FLAGS) -o $@$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/%.cpp${OEXT} : %.cpp
$(GNUSTEP_OBJ_DIR)/%.cpp$(OEXT) : %.cpp
$(ECHO_COMPILING)$(CXX) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
$($<_FILE_FLAGS) -o $@$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/%.cxx${OEXT} : %.cxx
$(GNUSTEP_OBJ_DIR)/%.cxx$(OEXT) : %.cxx
$(ECHO_COMPILING)$(CXX) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
$($<_FILE_FLAGS) -o $@$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/%.cp${OEXT} : %.cp
$(GNUSTEP_OBJ_DIR)/%.cp$(OEXT) : %.cp
$(ECHO_COMPILING)$(CXX) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_CFLAGS) \
$(ALL_CCFLAGS)) \
$($<_FILE_FLAGS) -o $@$(END_ECHO)
$(GNUSTEP_OBJ_DIR)/%.mm${OEXT} : %.mm
$(GNUSTEP_OBJ_DIR)/%.mm$(OEXT) : %.mm
$(ECHO_COMPILING)$(CXX) $< -c \
$(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
$(ALL_OBJCCFLAGS)) \
@ -586,7 +586,7 @@ ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
.SUFFIXES: .rc
# A rule to generate a .o file from the .rc file.
$(GNUSTEP_OBJ_DIR)/%.rc${OEXT}: %.rc
$(GNUSTEP_OBJ_DIR)/%.rc$(OEXT): %.rc
$(ECHO_COMPILING)windres $< $@$(END_ECHO)
endif
@ -599,7 +599,7 @@ ifeq ($(findstring cygwin, $(GNUSTEP_TARGET_OS)), cygwin)
.SUFFIXES: .rc
# A rule to generate a .o file from the .rc file.
$(GNUSTEP_OBJ_DIR)/%.rc${OEXT}: %.rc
$(GNUSTEP_OBJ_DIR)/%.rc$(OEXT): %.rc
$(ECHO_COMPILING)windres $< $@$(END_ECHO)
endif