Author: sebor
Date: Tue Oct 18 15:46:20 2005
New Revision: 326287
URL: http://svn.apache.org/viewcvs?rev=326287&view=rev
Log:
2005-10-18 Martin Sebor <[EMAIL PROTECTED]>
* makefile.common: Added *.msg files back to ALL_FILES (regression
introduced in rev 292348).
Streamlined and made consitent the computation of ALL_FILES.
Replaced vestiges of hardwired .s and .S suffixes with $(AS_EXT).
Modified:
incubator/stdcxx/trunk/etc/config/makefile.common
Modified: incubator/stdcxx/trunk/etc/config/makefile.common
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/makefile.common?rev=326287&r1=326286&r2=326287&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/makefile.common (original)
+++ incubator/stdcxx/trunk/etc/config/makefile.common Tue Oct 18 15:46:20 2005
@@ -18,12 +18,28 @@
INCLUDES = -I$(BUILDDIR)/include -I$(TOPDIR)/include
+ALL_FILES := "*"
+
+ifneq ($(AS_EXT),"")
+ ifneq ($(AS_EXT),".") # special value -- ignore atomic
+
+ # if the assembly file extension is non-empty and not the dot,
+ # add all files with that extension to the list of files to
+ # compile
+ ALL_FILES := $(foreach dir,$(SRCDIRS),\
+ $(wildcard $(dir)/*.cpp $(dir)/*.msg $(dir)/*$(AS_EXT)))
+ endif
+endif
+
+ifeq ($(ALL_FILES),"*")
+ # traverse all subdirectories and get the names of all source files
+ ALL_FILES := $(foreach dir,$(SRCDIRS), $(wildcard $(dir)/*.cpp $(dir)/*.msg))
+endif
+
+
# SRCDIRS must be defined in GNUmakefile that includes this file
ifeq ($(ONE_REPOSITORY),)
- # traverse all subdirectories and get the names of all regular files
- ALL_FILES := $(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*.cpp))
-
ifneq ($(CXX_REPOSITORY),)
# compose the name of the template instantiation repository from
@@ -69,21 +85,6 @@
ifneq ($(CXX_REPOSITORY),)
repository_name = repository.ti
endif
-
- # traverse the list of source directories (SRCDIRS) and put together
- # a list of .cpp files in each, ignoring any subdirectories
- ALL_FILES := $(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*.cpp))
-
- # if the assembly file extension is non-empty and not the dot,
- # add all files with that extension to the list of files to
- # compile
- ifneq ($(AS_EXT),"")
- ifneq ($(AS_EXT),".") # special value -- ignore atomic
- # traverse the list of source directories (SRCDIRS) and put together
- # a list of assembly source files in each, ignoring any subdirectories
- ALL_FILES += $(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*$(AS_EXT)))
- endif
- endif
endif
ifneq ($(repository_name),)
@@ -103,12 +104,11 @@
VPATH := $(SRCDIRS)
-SRCS := $(notdir $(filter %.cpp %.s %.S,$(ALL_FILES)))
+SRCS := $(notdir $(filter %.cpp %$(AS_EXT),$(ALL_FILES)))
SRCS := $(sort $(filter-out $(OMIT_SRCS),$(SRCS)))
OBJS := $(patsubst %.cpp,%.o,$(filter %.cpp,$(SRCS)))
-OBJS += $(patsubst %.s,%.o,$(filter %.s,$(SRCS)))
-OBJS += $(patsubst %.S,%.o,$(filter %.S,$(SRCS)))
+OBJS += $(patsubst %$(AS_EXT),%.o,$(filter %$(AS_EXT),$(SRCS)))
OBJS := $(sort $(OBJS))
# message files - text files used to generate a catalog - see gencat(1)
