Changeset bfba54e in rtems
- Timestamp:
- 10/10/01 00:22:21 (21 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 949b619
- Parents:
- 221c8f3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r221c8f3 rbfba54e 1 2001-10-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 3 * automake/compile.am: Fundamentally reworked compilation rules for 4 closer adaptation to automake's behavior. 5 1 6 2001-09-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 7 -
automake/compile.am
r221c8f3 rbfba54e 76 76 DEFS = @DEFS@ 77 77 78 CPPFLAGS += @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \78 CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \ 79 79 $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC) 80 80 CFLAGS = $(CFLAGS_DEFAULT) $(XCFLAGS) … … 115 115 # 116 116 117 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 118 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 119 120 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 121 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 122 117 123 ${ARCH}/%.o: %.c 118 ${COMPILE .c} $(AM_CPPFLAGS) $(AM_CFLAGS) -o $@$<124 ${COMPILE} -o $@ -c $< 119 125 120 126 ${ARCH}/%.o: %.cc 121 ${C OMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@$<127 ${CXXCOMPILE} -o $@ -c $< 122 128 123 129 ${ARCH}/%.o: %.cpp 124 ${C OMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@$<130 ${CXXCOMPILE} -o $@ -c $< 125 131 126 132 ${ARCH}/%.o: %.cxx 127 ${C OMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@$<133 ${CXXCOMPILE} -o $@ -c $< 128 134 129 135 ${ARCH}/%.o: %.C 130 ${C OMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@$<136 ${CXXCOMPILE} -o $@ -c $< 131 137 132 138 ${ARCH}/%.o: %.S … … 164 170 ## Replace $(ARCH) value with string $(ARCH) 165 171 ## so that it will for debug and profile cases 166 $(COMPILE .c) $(AM_CPPFLAGS) $(AM_CFLAGS) -M $^ | \172 $(COMPILE) $(AM_CPPFLAGS) $(AM_CFLAGS) -M $^ | \ 167 173 sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \ 168 174 -e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp … … 278 284 STRIP = @STRIP@ 279 285 280 ## 281 ## FIXME: DEFS and INCLUDES should not be passed as AM_CPPFLAGS282 AM_CPPFLAGS += $(DEFS) $(INCLUDES)$(RTEMS_CPPFLAGS)283 284 AM_CFLAGS += $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)285 AM_CXXFLAGS += $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)286 287 ## 288 AM_CPPFLAGS = $(RTEMS_CPPFLAGS) 289 290 AM_CFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V) 291 AM_CXXFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
Note: See TracChangeset
for help on using the changeset viewer.