Changeset 9a87463 in rtems


Ignore:
Timestamp:
Jan 18, 2004, 9:18:06 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
3d1de20
Parents:
0cf9970
Message:

2004-01-18 Ralf Corsepius <corsepiu@…>

  • clock/Makefile.am: Convert to using automake compilation rules.
  • mongoosev/Makefile.am: Ditto.
  • r46xx/Makefile.am: Ditto.
  • shared/Makefile.am: Ditto.
  • timer/Makefile.am: Ditto.
  • tx39/Makefile.am: Ditto.
  • Makefile.am: Remove conditional subdirs.
  • configure.ac: Add subdir-object to AUTOMAKE_OPTIONS. Require automake-1.8.2. Add AM_PROG_CC_C_O.
Location:
c/src/lib/libcpu/mips
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/mips/ChangeLog

    r0cf9970 r9a87463  
     12004-01-18      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * clock/Makefile.am: Convert to using automake compilation rules.
     4        * mongoosev/Makefile.am: Ditto.
     5        * r46xx/Makefile.am: Ditto.
     6        * shared/Makefile.am: Ditto.
     7        * timer/Makefile.am: Ditto.
     8        * tx39/Makefile.am: Ditto.
     9        * Makefile.am: Remove conditional subdirs.
     10        * configure.ac: Add subdir-object to AUTOMAKE_OPTIONS.
     11        Require automake-1.8.2. Add AM_PROG_CC_C_O.
     12
    1132004-01-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    214
  • c/src/lib/libcpu/mips/Makefile.am

    r0cf9970 r9a87463  
    55ACLOCAL_AMFLAGS = -I ../../../aclocal
    66
    7 SHARED_LIB = shared
    8 
    9 if mongoosev
    10 CPU_SUBDIR = mongoosev
    11 endif
    12 
    13 if tx39
    14 CPU_SUBDIR = tx39
    15 endif
    16 
    17 if r46xx
    18 CPU_SUBDIR = clock timer r46xx
    19 endif
    20 
    21 SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR)
     7SUBDIRS = shared mongoosev tx39 clock timer r46xx
    228
    239include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/lib/libcpu/mips/clock/Makefile.am

    r0cf9970 r9a87463  
    33##
    44
    5 PGM = $(ARCH)/clock.rel
    6 
    7 C_FILES = ckinit.c
    8 
    9 S_FILES = clock.S
    10 
    11 noinst_HEADERS = clock.h
    12 
    13 clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
    14     $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
     5EXTRA_PROGRAMS =
     6CLEANFILES =
     7noinst_DATA =
    158
    169include $(top_srcdir)/../../../automake/compile.am
    1710include $(top_srcdir)/../../../automake/lib.am
    1811
    19 #
    20 # (OPTIONAL) Add local stuff here using +=
    21 #
     12if r46xx
     13EXTRA_PROGRAMS += clock.rel
     14CLEANFILES += clock.rel
     15clock_rel_SOURCES = ckinit.c clock.S clock.h
     16clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     17clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2218
    23 $(PGM): $(clock_rel_OBJECTS)
    24         $(make-rel)
     19EXTRA_PROGRAMS += clock_g.rel
     20CLEANFILES += clock_g.rel
     21clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     22clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     23clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2524
    26 all-local: $(clock_rel_OBJECTS) $(PGM)
    27 
    28 .PRECIOUS: $(PGM)
    29 
    30 EXTRA_DIST = ckinit.c clock.S clock.h
     25noinst_DATA += clock$(LIB_VARIANT).rel
     26endif
    3127
    3228include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/mips/configure.ac

    r0cf9970 r9a87463  
    1919
    2020RTEMS_PROG_CC_FOR_TARGET
     21AM_PROG_CC_C_O
    2122RTEMS_CANONICALIZE_TOOLS
    2223RTEMS_PROG_CCAS
  • c/src/lib/libcpu/mips/mongoosev/Makefile.am

    r0cf9970 r9a87463  
    55ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
    66
     7EXTRA_PROGRAMS =
    78EXTRA_DIST =
    8 CLEANDIRS =
     9CLEANFILES =
    910noinst_DATA =
    1011
     
    1213include $(top_srcdir)/../../../automake/lib.am
    1314
     15if mongoosev
    1416include_mipsdir = $(includedir)/libcpu
    1517include_mips_HEADERS = include/mongoose-v.h
     
    1921include_libchip_HEADERS = duart/mg5uart.h
    2022
    21 duart_C_FILES = duart/mg5uart.c duart/mg5uart_reg.c
    22 EXTRA_DIST += $(duart_C_FILES) duart/README.mguart
     23EXTRA_DIST += duart/README.mguart
    2324
    24 duart_rel_OBJECTS = $(duart_C_FILES:duart/%.c=duart/$(ARCH)/%.$(OBJEXT))
     25EXTRA_PROGRAMS += duart.rel
     26CLEANFILES += duart.rel
     27duart_rel_SOURCES = duart/mg5uart.c duart/mg5uart.h duart/mg5uart_reg.c
     28duart_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     29duart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2530
    26 duart/$(ARCH)/$(dirstamp):
    27         @$(mkdir_p) duart/$(ARCH)
    28         @: > duart/$(ARCH)/$(dirstamp)
    29 duart/$(ARCH)/%.$(OBJEXT): duart/%.c duart/$(ARCH)/$(dirstamp)
    30         ${COMPILE} -o $@ -c $<
    31 duart/$(ARCH)/mg5uart.rel: $(duart_rel_OBJECTS)
    32         $(make-rel)
    33 CLEANDIRS += duart/o-optimize duart/o-debug
    34 noinst_DATA += duart/$(ARCH)/mg5uart.rel
     31EXTRA_PROGRAMS += duart_g.rel
     32CLEANFILES += duart_g.rel
     33duart_g_rel_SOURCES = $(duart_rel_SOURCES)
     34duart_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     35duart_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     36
     37noinst_DATA += duart$(LIB_VARIANT).rel
    3538
    3639## vectorisrs
    37 vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
    38 EXTRA_DIST += $(vectorisrs_C_FILES)
    3940
    40 vectorisrs_rel_OBJECTS = \
    41     $(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
     41EXTRA_PROGRAMS += vectorisrs.rel
     42CLEANFILES += vectorisrs.rel
     43vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
     44vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     45vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4246
    43 vectorisrs/$(ARCH)/$(dirstamp):
    44         @$(mkdir_p) vectorisrs/$(ARCH)
    45         @: > vectorisrs/$(ARCH)/$(dirstamp)
    46 vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
    47         ${COMPILE} -o $@ -c $<
    48 vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
    49         $(make-rel)
    50 CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
    51 noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
     47EXTRA_PROGRAMS += vectorisrs_g.rel
     48CLEANFILES += vectorisrs_g.rel
     49vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
     50vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     51vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5252
    53 ## --
    54 
    55 all-local: $(PREINSTALL_FILES)
     53noinst_DATA += vectorisrs$(LIB_VARIANT).rel
     54endif
    5655
    5756all-local: $(PREINSTALL_FILES)
     
    5958PREINSTALL_FILES =
    6059
     60if mongoosev
    6161$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
    6262        @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
     
    7676        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h
    7777PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
     78endif
    7879
    79 CLEANFILES = $(PREINSTALL_FILES)
     80CLEANFILES += $(PREINSTALL_FILES)
    8081
    8182include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/mips/r46xx/Makefile.am

    r0cf9970 r9a87463  
    55ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
    66
    7 EXTRA_DIST =
    8 CLEANDIRS =
     7EXTRA_PROGRAMS =
     8CLEANFILES =
    99noinst_DATA =
    1010
     
    1212include $(top_srcdir)/../../../automake/lib.am
    1313
    14 vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
    15 EXTRA_DIST += $(vectorisrs_C_FILES)
     14if r46xx
     15EXTRA_PROGRAMS += vectorisrs.rel
     16CLEANFILES += vectorisrs.rel
     17vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
     18vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     19vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    1620
    17 vectorisrs_rel_OBJECTS = \
    18     $(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
     21EXTRA_PROGRAMS += vectorisrs_g.rel
     22CLEANFILES += vectorisrs_g.rel
     23vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
     24vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     25vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    1926
    20 vectorisrs/$(ARCH)/$(dirstamp):
    21         @$(mkdir_p) vectorisrs/$(ARCH)
    22         @: > vectorisrs/$(ARCH)/$(dirstamp)
    23 vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
    24         ${COMPILE} -o $@ -c $<
    25 vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
    26         $(make-rel)
    27 CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
    28 noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
    29 
    30 ## --
     27noinst_DATA += vectorisrs$(LIB_VARIANT).rel
     28endif
    3129
    3230include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/mips/shared/Makefile.am

    r0cf9970 r9a87463  
    44
    55EXTRA_DIST =
    6 CLEANDIRS =
     6CLEANFILES =
    77noinst_DATA =
     8EXTRA_PROGRAMS =
    89
    910include $(top_srcdir)/../../../automake/compile.am
     
    1314include_libcpudir = $(includedir)/libcpu
    1415
    15 noinst_HEADERS = cache/cache_.h
    1616include_libcpu_HEADERS = ../../shared/include/cache.h
    1717
    18 cache_C_FILES = cache/cache.c
    19 common_C_FILES = ../../shared/src/cache_aligned_malloc.c
    20 common_C_FILES += ../../shared/src/cache_manager.c
     18EXTRA_PROGRAMS += cache.rel
     19CLEANFILES += cache.rel
     20cache_rel_SOURCES = cache/cache.c ../../shared/src/cache_aligned_malloc.c \
     21    ../../shared/src/cache_manager.c cache/cache_.h
     22cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/cache
     23cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2124
    22 cache_rel_OBJECTS = $(cache_C_FILES:cache/%.c=cache/$(ARCH)/%.$(OBJEXT))
    23 cache_rel_OBJECTS += \
    24     $(common_C_FILES:../../shared/src/%.c=cache/$(ARCH)/%.$(OBJEXT))
     25EXTRA_PROGRAMS += cache_g.rel
     26CLEANFILES += cache_g.rel
     27cache_g_rel_SOURCES = $(cache_rel_SOURCES)
     28cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/cache
     29cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2530
    26 AM_CPPFLAGS += -I$(srcdir)/cache
    27 
    28 cache/$(ARCH)/$(dirstamp):
    29         @$(mkdir_p) cache/$(ARCH)
    30         @: > cache/$(ARCH)/$(dirstamp)
    31 cache/$(ARCH)/%.$(OBJEXT): cache/%.c cache/$(ARCH)/$(dirstamp)
    32         ${COMPILE} -o $@ -c $<
    33 cache/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c cache/$(ARCH)/$(dirstamp)
    34         ${COMPILE} -o $@ -c $<
    35 cache/$(ARCH)/cache.rel: $(cache_rel_OBJECTS)
    36         $(make-rel)
    37 CLEANDIRS += cache/o-optimize cache/o-debug
    38 noinst_DATA += cache/$(ARCH)/cache.rel
     31noinst_DATA += cache$(LIB_VARIANT).rel
    3932
    4033## interrupts
    4134
    42 interrupts_C_FILES = interrupts/installisrentries.c \
    43     interrupts/vectorexceptions.c
    44 interrupts_S_FILES = interrupts/isr_entries.S
    45 
    46 interrupts_rel_OBJECTS = \
    47     $(interrupts_C_FILES:interrupts/%.c=interrupts/$(ARCH)/%.$(OBJEXT)) \
    48     $(interrupts_S_FILES:interrupts/%.S=interrupts/$(ARCH)/%.$(OBJEXT))
    49 
    5035if tx39
    51 EXTRA_FLAGS = -DTX39
     36interrupts_CPPFLAGS = -DTX39
    5237endif
    5338
    5439if mongoosev
    55 EXTRA_FLAGS = -DMONGOOSEV
     40interrupts_CPPFLAGS = -DMONGOOSEV
    5641endif
    5742
    58 AM_CPPFLAGS += $(EXTRA_FLAGS)
     43EXTRA_PROGRAMS += interrupts.rel
     44CLEANFILES += interrupts.rel
     45interrupts_rel_SOURCES = interrupts/installisrentries.c \
     46    interrupts/vectorexceptions.c interrupts/isr_entries.S
     47interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     48    $(interrupts_CPPFLAGS)
     49interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5950
    60 interrupts/$(ARCH)/$(dirstamp):
    61         @$(mkdir_p) interrupts/$(ARCH)
    62         @: > interrupts/$(ARCH)/$(dirstamp)
    63 interrupts/$(ARCH)/%.$(OBJEXT): interrupts/%.c interrupts/$(ARCH)/$(dirstamp)
    64         ${COMPILE} -o $@ -c $<
    65 interrupts/$(ARCH)/%.$(OBJEXT): interrupts/%.S interrupts/$(ARCH)/$(dirstamp)
    66         ${CCASCOMPILE} -o $@ -c $<
    67 interrupts/$(ARCH)/interrupts.rel: $(interrupts_rel_OBJECTS)
    68         $(make-rel)
    69 CLEANDIRS += interrupts/o-optimize interrupts/o-debug
    70 noinst_DATA += interrupts/$(ARCH)/interrupts.rel
     51EXTRA_PROGRAMS += interrupts_g.rel
     52CLEANFILES += interrupts_g.rel
     53interrupts_g_rel_SOURCES = $(interrupts_rel_SOURCES)
     54interrupts_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
     55    $(interrupts_CPPFLAGS)
     56interrupts_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     57
     58noinst_DATA += interrupts$(LIB_VARIANT).rel
     59
     60all-local: $(PREINSTALL_FILES)
    7161
    7262## --
     
    8373PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
    8474
    85 CLEANFILES = $(PREINSTALL_FILES)
     75CLEANFILES += $(PREINSTALL_FILES)
    8676
    8777include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/mips/timer/Makefile.am

    r0cf9970 r9a87463  
    33##
    44
    5 PGM = $(ARCH)/timer.rel
    6 
    7 C_FILES = timer.c
    8 
    9 S_FILES = gettime.S
    10 
    11 timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
    12     $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
     5EXTRA_PROGRAMS =
     6CLEANFILES =
     7noinst_DATA =
    138
    149include $(top_srcdir)/../../../automake/compile.am
    1510include $(top_srcdir)/../../../automake/lib.am
    1611
    17 #
    18 # (OPTIONAL) Add local stuff here using +=
    19 #
     12if r46xx
     13EXTRA_PROGRAMS += timer.rel
     14CLEANFILES += timer.rel
     15timer_rel_SOURCES = timer.c gettime.S
     16timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     17timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2018
    21 $(PGM): $(timer_rel_OBJECTS)
    22         $(make-rel)
     19EXTRA_PROGRAMS += timer_g.rel
     20CLEANFILES += timer_g.rel
     21timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     22timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     23timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2324
    24 all-local: $(timer_rel_OBJECTS) $(PGM)
    25 
    26 .PRECIOUS: $(PGM)
    27 
    28 EXTRA_DIST = gettime.S timer.c
     25noinst_DATA += timer$(LIB_VARIANT).rel
     26endif
    2927
    3028include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/mips/tx39/Makefile.am

    r0cf9970 r9a87463  
    55ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
    66
    7 EXTRA_DIST =
    8 CLEANDIRS =
     7EXTRA_PROGRAMS =
     8CLEANFILES =
    99noinst_DATA =
    1010
     
    1212include $(top_srcdir)/../../../automake/lib.am
    1313
     14if tx39
    1415include_libcpudir = $(includedir)/libcpu
    1516include_libcpu_HEADERS = include/tx3904.h
    1617
    17 ## vectorisrs
    18 vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
    19 EXTRA_DIST += $(vectorisrs_C_FILES)
     18EXTRA_PROGRAMS += vectorisrs.rel
     19CLEANFILES += vectorisrs.rel
     20vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
     21vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     22vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2023
    21 vectorisrs_rel_OBJECTS = \
    22     $(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
     24EXTRA_PROGRAMS += vectorisrs_g.rel
     25CLEANFILES += vectorisrs_g.rel
     26vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
     27vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     28vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2329
    24 vectorisrs/$(ARCH)/$(dirstamp):
    25         @$(mkdir_p) vectorisrs/$(ARCH)
    26         @: > vectorisrs/$(ARCH)/$(dirstamp)
    27 vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
    28         ${COMPILE} -o $@ -c $<
    29 vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
    30         $(make-rel)
    31 CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
    32 noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
    33 
    34 ## --
     30noinst_DATA += vectorisrs$(LIB_VARIANT).rel
     31endif
    3532
    3633all-local: $(PREINSTALL_FILES)
     
    3835PREINSTALL_FILES =
    3936
     37if tx39
    4038$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
    4139        @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
     
    4644        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h
    4745PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
     46endif
    4847
    49 CLEANFILES = $(PREINSTALL_FILES)
     48CLEANFILES += $(PREINSTALL_FILES)
    5049
    5150include $(top_srcdir)/../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.