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.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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.