Changeset bfba54e in rtems

Timestamp:

Oct 10, 2001, 12:22:21 AM (19 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

949b619

Parents:

221c8f3

Message:

2001-10-09 Ralf Corsepius <corsepiu@…>

• automake/compile.am: Fundamentally reworked compilation rules for closer adaptation to automake's behavior.

Files:

• ChangeLog (modified) (1 diff)
• automake/compile.am (modified) (4 diffs)

ChangeLog

@@ +1 @@
+2001-10-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * automake/compile.am: Fundamentally reworked compilation rules for 
+        closer adaptation to automake's behavior.
+
 2001-09-27      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

automake/compile.am

@@ -76 +76 @@
 DEFS = @DEFS@
 
-CPPFLAGS += @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \
+CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \
    $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
 CFLAGS   = $(CFLAGS_DEFAULT) $(XCFLAGS)
@@ -115 +115 @@
 #
 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
 ${ARCH}/%.o: %.c
-        ${COMPILE.c} $(AM_CPPFLAGS) $(AM_CFLAGS) -o $@ $<
+        ${COMPILE} -o $@ -c $<
 
 ${ARCH}/%.o: %.cc
-        ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
+        ${CXXCOMPILE} -o $@ -c $<
 
 ${ARCH}/%.o: %.cpp
-        ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
+        ${CXXCOMPILE} -o $@ -c $<
 
 ${ARCH}/%.o: %.cxx
-        ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
+        ${CXXCOMPILE} -o $@ -c $<
 
 ${ARCH}/%.o: %.C
-        ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
+        ${CXXCOMPILE} -o $@ -c $<
 
 ${ARCH}/%.o: %.S
@@ -164 +170 @@
 ##       Replace $(ARCH) value with string $(ARCH)
 ##           so that it will for debug and profile cases
-        $(COMPILE.c) $(AM_CPPFLAGS) $(AM_CFLAGS) -M   $^    |  \
+        $(COMPILE) $(AM_CPPFLAGS) $(AM_CFLAGS) -M   $^    |  \
         sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
             -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
@@ -278 +284 @@
 STRIP = @STRIP@
 
-##
-## FIXME: DEFS and INCLUDES should not be passed as AM_CPPFLAGS
-AM_CPPFLAGS += $(DEFS) $(INCLUDES) $(RTEMS_CPPFLAGS)
-
-AM_CFLAGS += $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
-AM_CXXFLAGS += $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
+
+##
+AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
+
+AM_CFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
+AM_CXXFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)