Changeset 18039447 in rtems


Ignore:
Timestamp:
Jan 20, 2004, 2:20:27 AM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
1116601
Parents:
7023111e
Message:

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

  • m68040/Makefile.am: Merge-in m68040/fpsp/Makefile.am. Use automake-compilation rules.
  • m68040/fpsp/Makefile.am: Remove.
  • shared/Makefile.am: Use automake compilation rules.
  • Makefile.am: Reflect changes above. Remove CPU_SUBDIR.
  • configure.ac: Require automake >= 1.8.2. Add subdir-objects to AUTOMAKE_OPTIONS. Remove CHECK_CUSTOM_BSP. Reflect changes above.
Location:
c/src/lib/libcpu/m68k
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libcpu/m68k/ChangeLog

    r7023111e r18039447  
     12004-01-20      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * m68040/Makefile.am: Merge-in m68040/fpsp/Makefile.am.
     4        Use automake-compilation rules.
     5        * m68040/fpsp/Makefile.am: Remove.
     6        * shared/Makefile.am: Use automake compilation rules.
     7        * Makefile.am: Reflect changes above. Remove CPU_SUBDIR.
     8        * configure.ac: Require automake >= 1.8.2.
     9        Add subdir-objects to AUTOMAKE_OPTIONS.
     10        Remove CHECK_CUSTOM_BSP.
     11        Reflect changes above.
     12
    1132004-01-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    214

  • c/src/lib/libcpu/m68k/Makefile.am

    r7023111e r18039447  
    55ACLOCAL_AMFLAGS = -I ../../../aclocal
    66
    7 if shared
    8 SHARED_LIB = shared
    9 endif
    10 
    11 if m68040
    12 CPU_SUBDIR = m68040
    13 endif
    14 
    15 if mcf5206
    16 CPU_SUBDIR = mcf5206
    17 endif
    18 
    19 SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR)
     7SUBDIRS = shared m68040 mcf5206
    208
    219include $(top_srcdir)/../../../automake/subdirs.am

  • c/src/lib/libcpu/m68k/configure.ac

    r7023111e r18039447  
    1010RTEMS_CANONICAL_TARGET_CPU
    1111
    12 AM_INIT_AUTOMAKE([no-define foreign 1.8])
     12AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2])
    1313AM_MAINTAINER_MODE
    1414
    … …  
    1616RTEMS_ENV_RTEMSBSP
    1717
    18 
    1918RTEMS_PROJECT_ROOT
    2019
    2120RTEMS_PROG_CC_FOR_TARGET
     21AM_PROG_CC_C_O
    2222RTEMS_CANONICALIZE_TOOLS
    2323RTEMS_PROG_CCAS
    24 
    25 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2624
    2725# At this time all models should use the shared directory so do this
    … …  
    4644AM_CONDITIONAL(mcf5272, test "$RTEMS_CPU_MODEL" = "mcf5272" )
    4745
    48 case "$RTEMS_CPU_MODEL" in
    49 mcf5206 ) AC_CONFIG_SUBDIRS([mcf5206]);;
    50 *) ;;
    51 esac
    52 
    5346# Explicitly list all Makefiles here
    5447AC_CONFIG_FILES([Makefile
    5548shared/Makefile
    5649m68040/Makefile
    57 m68040/fpsp/Makefile])
     50mcf5206/Makefile
     51])
    5852AC_OUTPUT

  • c/src/lib/libcpu/m68k/m68040/Makefile.am

    r7023111e r18039447  
    33##
    44
    5 SUBDIRS = fpsp
     5EXTRA_PROGRAMS =
     6CLEANFILES =
     7noinst_DATA =
    68
    7 include $(top_srcdir)/../../../automake/subdirs.am
     9include $(top_srcdir)/../../../automake/compile.am
     10include $(top_srcdir)/../../../automake/lib.am
     11
     12if m68040
     13EXTRA_PROGRAMS += fpsp.rel
     14CLEANFILES += fpsp.rel
     15fpsp_rel_SOURCES = fpsp/rtems_fpsp.c fpsp/bindec.S fpsp/binstr.S \
     16    fpsp/bugfix.S fpsp/decbin.S fpsp/do_func.S fpsp/gen_except.S \
     17    fpsp/get_op.S fpsp/kernel_ex.S fpsp/res_func.S fpsp/round.S \
     18    fpsp/rtems_skel.S fpsp/sacos.S fpsp/sasin.S fpsp/satan.S fpsp/satanh.S \
     19    fpsp/scale.S fpsp/scosh.S fpsp/setox.S fpsp/sgetem.S fpsp/sint.S \
     20    fpsp/slog2.S fpsp/slogn.S fpsp/smovecr.S fpsp/srem_mod.S fpsp/ssin.S \
     21    fpsp/ssinh.S fpsp/stan.S fpsp/stanh.S fpsp/sto_res.S fpsp/stwotox.S \
     22    fpsp/tbldo.S fpsp/util.S fpsp/x_bsun.S fpsp/x_fline.S fpsp/x_operr.S \
     23    fpsp/x_ovfl.S fpsp/x_snan.S fpsp/x_store.S fpsp/x_unfl.S fpsp/x_unimp.S \
     24    fpsp/x_unsupp.S
     25fpsp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     26fpsp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     27
     28EXTRA_PROGRAMS += fpsp_g.rel
     29CLEANFILES += fpsp_g.rel
     30fpsp_g_rel_SOURCES = $(fpsp_rel_SOURCES)
     31fpsp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     32fpsp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     33
     34noinst_DATA += fpsp$(LIB_VARIANT).rel
     35
     36noinst_HEADERS = fpsp/fpsp.defs
     37endif
     38EXTRA_DIST = fpsp/README
     39
    840include $(top_srcdir)/../../../automake/local.am

  • c/src/lib/libcpu/m68k/shared/Makefile.am

    r7023111e r18039447  
    33##
    44
    5 CLEANDIRS =
     5CLEANFILES =
    66EXTRA_DIST =
     7EXTRA_PROGRAMS =
    78noinst_DATA =
    89
    … …  
    1011include $(top_srcdir)/../../../automake/lib.am
    1112
    12 ## cache
    13 
    14 cache_C_FILES = cache/cache.c
    15 EXTRA_DIST += $(cache_C_FILES)
    16 cache_OBJECTS = $(cache_C_FILES:cache/%.c=cache/$(ARCH)/%.$(OBJEXT))
    17 
    18 common_C_FILES = ../../shared/src/cache_aligned_malloc.c
    19 common_C_FILES += ../../shared/src/cache_manager.c
    20 cache_OBJECTS += \
    21     $(common_C_FILES:../../shared/src/%.c=cache/$(ARCH)/%.$(OBJEXT))
    22 
    23 cache/$(ARCH)/$(dirstamp):
    24         @$(mkdir_p) cache/$(ARCH)
    25         @: > cache/$(ARCH)/$(dirstamp)
    26 cache/$(ARCH)/%.$(OBJEXT): cache/%.c cache/$(ARCH)/$(dirstamp)
    27         ${COMPILE} -I$(srcdir)/cache $(M68K_CPPFLAGS) -o $@ -c $<
    28 cache/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c cache/$(ARCH)/$(dirstamp)
    29         ${COMPILE} -I$(srcdir)/cache $(M68K_CPPFLAGS) -o $@ -c $<
    30 CLEANDIRS += cache/o-optimize cache/o-debug
    31 noinst_DATA += $(cache_OBJECTS)
    32 
     13if shared
    3314include_libcpudir = $(includedir)/libcpu
    3415
    35 noinst_HEADERS = cache/cache_.h
     16## cache
    3617include_libcpu_HEADERS = ../../shared/include/cache.h
    3718
     19EXTRA_PROGRAMS += cache.rel
     20CLEANFILES += cache.rel
     21cache_rel_SOURCES = cache/cache.c cache/cache_.h \
     22    ../../shared/src/cache_aligned_malloc.c \
     23    ../../shared/src/cache_manager.c
     24cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/cache
     25cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     26
     27EXTRA_PROGRAMS += cache_g.rel
     28CLEANFILES += cache_g.rel
     29cache_g_rel_SOURCES = $(cache_rel_SOURCES)
     30cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/cache
     31cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     32
     33noinst_DATA += cache$(LIB_VARIANT).rel
     34
    3835## misc
    39 
    40 misc_C_FILES = misc/memcpy.c misc/m68kidle.c
    41 misc_OBJECTS = $(misc_C_FILES:misc/%.c=misc/$(ARCH)/%.$(OBJEXT))
    4236
    4337# gcc doesn't recognize difference between the cpu32 and cpu32+ so we have to
    … …  
    4943endif
    5044
    51 misc/$(ARCH)/$(dirstamp):
    52         @$(mkdir_p) misc/$(ARCH)
    53         @: > misc/$(ARCH)/$(dirstamp)
    54 misc/$(ARCH)/%.$(OBJEXT): misc/%.c misc/$(ARCH)/$(dirstamp)
    55         ${COMPILE} $(M68K_CPPFLAGS) -o $@ -c $<
    56 CLEANDIRS += misc/o-optimize misc/o-debug
    57 noinst_DATA += $(misc_OBJECTS)
     45EXTRA_PROGRAMS += misc.rel
     46CLEANFILES += misc.rel
     47misc_rel_SOURCES = misc/memcpy.c misc/m68kidle.c
     48misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(M68K_CPPFLAGS)
     49misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     50
     51EXTRA_PROGRAMS += misc_g.rel
     52CLEANFILES += misc_g.rel
     53misc_g_rel_SOURCES = $(misc_rel_SOURCES)
     54misc_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(M68K_CPPFLAGS)
     55misc_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     56
     57noinst_DATA += misc$(LIB_VARIANT).rel
     58endif
    5859
    5960## --
    6061all-local: $(PREINSTALL_FILES)
    6162
     63PREINSTALL_DIRS =
    6264PREINSTALL_FILES =
    6365
     66if shared
    6467$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
    6568        @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
    6669        @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
    67 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
     70PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
    6871
    6972$(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
    … …  
    7174PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
    7275
    73 CLEANFILES = $(PREINSTALL_FILES)
     76endif
     77
     78CLEANFILES += $(PREINSTALL_FILES)
     79DISTCLEANFILES = $(PREINSTALL_DIRS)
    7480
    7581include $(top_srcdir)/../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.