Changeset 11cafc0 in rtems

Timestamp:

02/12/04 12:10:29 (19 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

e9e6b77

Parents:

c24d7c84

Message:

2004-02-12 Ralf Corsepius <corsepiu@…>

• wrapup/Makefile.am: Don't include lib.am.
• automake/compile.am: Use automake compilation rules.

Location:

c/src

Files:

• ChangeLog (modified) (1 diff)
• automake/compile.am (modified) (5 diffs)
• wrapup/Makefile.am (modified) (5 diffs)

c/src/ChangeLog

@@ +1 @@
+2004-02-12      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * wrapup/Makefile.am: Don't include lib.am.
+        * automake/compile.am: Use automake compilation rules.
+
 2004-02-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/automake/compile.am

@@ -37 +37 @@
 ## 'VARIANT=<OPTIMIZE|DEBUG>' targets to their _V values.
 
-## XCPPFLAGS, XCFLAGS, XCXXFLAGS, XASFLAGS 
-## are used to add flags from the shell
-## cf. make.info ("Implicit rules/variables" for details)
-
 if RTEMS_USE_GCC
 ## All the stuff below is specific to gcc
@@ -54 +50 @@
 DEFS = @DEFS@
 
-CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
-CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
+CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES)
+CFLAGS   = @RTEMS_CFLAGS@
 ## FIXME: This should be correct, but is not supported, yet
 # CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
@@ -62 +58 @@
 ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
 
-#
-# Client compiler and support tools
-#
-
-#
-# How to compile stuff into ${ARCH} subdirectory
-#
-
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
-CCAS = $(CC)
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-
-# OBSOLETE: Don't use
-AS = $(CC)
-ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS)
-
-${ARCH}/%.o: %.c $(ARCH)/$(dirstamp)
-        ${COMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.cc $(ARCH)/$(dirstamp)
-        ${CXXCOMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.S $(ARCH)/$(dirstamp)
-        ${CCASCOMPILE} -DASM -o $@ -c $<
-
-${ARCH}/$(dirstamp):
-        @$(mkdir_p) $(ARCH)
-        @: > $(ARCH)/$(dirstamp)
-
-# Dependency files for use by gmake
-# NOTE: we don't put them into $(ARCH)
-#       so that 'make clean' doesn't blow it away
-
-DEPEND=Depends-${ARCH}
-
-# We deliberately don't have anything depend on the
-# $(DEPEND) file; otherwise it will get rebuilt even
-# on 'make clean'
-#
-
-if RTEMS_USE_GCC
-## HACK: Specific to gcc
-## FIXME: The approach below is known to be conceptionally broken.
-depend-gcc: $(C_FILES) $(CC_FILES) $(S_FILES)
-##       Use gcc -M to generate dependencies
-##       Replace foo.o with $(ARCH)/foo.o
-##       Replace $(ARCH) value with string $(ARCH)
-##           so that it will for debug cases
-        $(COMPILE) -M   $^    |  \
-        sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
-            -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
-        mv $(DEPEND).tmp $(DEPEND)
-
-# pull in dependencies if they exist  
-ifeq (${DEPEND},$(wildcard ${DEPEND}))
-include ${DEPEND}
-@ENDIF@
-endif
-depend: depend-am
+depend:
 
 if RTEMS_USE_GCC
@@ -157 +84 @@
 
 VARIANT_V = $(VARIANT_$(VARIANT)_V)
-
-## Setup the variant build subdirectory
-ARCH_OPTIMIZE_V = o-optimize
-ARCH_DEBUG_V = o-debug
-
-ARCH__V = $(ARCH_OPTIMIZE_V)
-ARCH = $(ARCH_$(VARIANT_V)_V)
 
 ## Setup the library suffix
@@ -207 +127 @@
 AM_CFLAGS =
 AM_CXXFLAGS =
-AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
-
-clean-local:
-        $(RM) -r o-optimize o-debug $(CLEANDIRS)
-        $(RM) Depends-o-optimize.tmp Depends-o-debug.tmp
+AM_CCASFLAGS = $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)

c/src/wrapup/Makefile.am

@@ -6 +6 @@
 
 include $(top_srcdir)/automake/compile.am
-include $(top_srcdir)/automake/lib.am
+
+## Setup the variant build subdirectory
+ARCH_OPTIMIZE_V = o-optimize
+ARCH_DEBUG_V = o-debug
+                                                                                
+ARCH__V = $(ARCH_OPTIMIZE_V)
+ARCH = $(ARCH_$(VARIANT_V)_V)
 
 project_lib_DATA = $(ARCH)/librtemsbsp$(LIB_VARIANT).a
+CLEANFILES = o-optimize/librtemsbsp.a
+CLEANFILES += o-debug/librtemsbsp_g.a
 
 SRCS = ../support/libsupport$(LIB_VARIANT).a
@@ -35 +43 @@
 endif
 
-SRCS += $(wildcard $(PROJECT_LIB)/libcpu$(LIB_VARIANT).a)
+# FIXME: ATM, there is no libcpu.a, anymore.
+# SRCS += $(wildcard $(PROJECT_LIB)/libcpu$(LIB_VARIANT).a)
 
 if LIBCHIP
@@ -54 +63 @@
 all-local: $(TMPINSTALL_FILES)
 
-$(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS) $(ARCH)/$(dirstamp)
+$(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS)
+        rm -f $@
+        $(mkdir_p) $(ARCH)
         rm -rf $(ARCH)/*.a $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
         for f in $(SRCS); do \
@@ -80 +91 @@
         done
         $(AR) rc $@ $(ARCH)/*
+        rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
         $(RANLIB) $@
 
@@ -93 +105 @@
 TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
 
-CLEANFILES = $(TMPINSTALL_FILES)
+CLEANFILES += $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/automake/local.am