Changeset 18039447 in rtems
- Timestamp:
- Jan 20, 2004, 2:20:27 AM (17 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 1116601
- Parents:
- 7023111e
- Location:
- c/src/lib/libcpu/m68k
- Files:
-
- 1 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libcpu/m68k/ChangeLog
r7023111e r18039447 1 2004-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 1 13 2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 14 -
c/src/lib/libcpu/m68k/Makefile.am
r7023111e r18039447 5 5 ACLOCAL_AMFLAGS = -I ../../../aclocal 6 6 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) 7 SUBDIRS = shared m68040 mcf5206 20 8 21 9 include $(top_srcdir)/../../../automake/subdirs.am -
c/src/lib/libcpu/m68k/configure.ac
r7023111e r18039447 10 10 RTEMS_CANONICAL_TARGET_CPU 11 11 12 AM_INIT_AUTOMAKE([no-define foreign 1.8])12 AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) 13 13 AM_MAINTAINER_MODE 14 14 … … 16 16 RTEMS_ENV_RTEMSBSP 17 17 18 19 18 RTEMS_PROJECT_ROOT 20 19 21 20 RTEMS_PROG_CC_FOR_TARGET 21 AM_PROG_CC_C_O 22 22 RTEMS_CANONICALIZE_TOOLS 23 23 RTEMS_PROG_CCAS 24 25 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)26 24 27 25 # At this time all models should use the shared directory so do this … … 46 44 AM_CONDITIONAL(mcf5272, test "$RTEMS_CPU_MODEL" = "mcf5272" ) 47 45 48 case "$RTEMS_CPU_MODEL" in49 mcf5206 ) AC_CONFIG_SUBDIRS([mcf5206]);;50 *) ;;51 esac52 53 46 # Explicitly list all Makefiles here 54 47 AC_CONFIG_FILES([Makefile 55 48 shared/Makefile 56 49 m68040/Makefile 57 m68040/fpsp/Makefile]) 50 mcf5206/Makefile 51 ]) 58 52 AC_OUTPUT -
c/src/lib/libcpu/m68k/m68040/Makefile.am
r7023111e r18039447 3 3 ## 4 4 5 SUBDIRS = fpsp 5 EXTRA_PROGRAMS = 6 CLEANFILES = 7 noinst_DATA = 6 8 7 include $(top_srcdir)/../../../automake/subdirs.am 9 include $(top_srcdir)/../../../automake/compile.am 10 include $(top_srcdir)/../../../automake/lib.am 11 12 if m68040 13 EXTRA_PROGRAMS += fpsp.rel 14 CLEANFILES += fpsp.rel 15 fpsp_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 25 fpsp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) 26 fpsp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) 27 28 EXTRA_PROGRAMS += fpsp_g.rel 29 CLEANFILES += fpsp_g.rel 30 fpsp_g_rel_SOURCES = $(fpsp_rel_SOURCES) 31 fpsp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) 32 fpsp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) 33 34 noinst_DATA += fpsp$(LIB_VARIANT).rel 35 36 noinst_HEADERS = fpsp/fpsp.defs 37 endif 38 EXTRA_DIST = fpsp/README 39 8 40 include $(top_srcdir)/../../../automake/local.am -
c/src/lib/libcpu/m68k/shared/Makefile.am
r7023111e r18039447 3 3 ## 4 4 5 CLEAN DIRS =5 CLEANFILES = 6 6 EXTRA_DIST = 7 EXTRA_PROGRAMS = 7 8 noinst_DATA = 8 9 … … 10 11 include $(top_srcdir)/../../../automake/lib.am 11 12 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 13 if shared 33 14 include_libcpudir = $(includedir)/libcpu 34 15 35 noinst_HEADERS = cache/cache_.h 16 ## cache 36 17 include_libcpu_HEADERS = ../../shared/include/cache.h 37 18 19 EXTRA_PROGRAMS += cache.rel 20 CLEANFILES += cache.rel 21 cache_rel_SOURCES = cache/cache.c cache/cache_.h \ 22 ../../shared/src/cache_aligned_malloc.c \ 23 ../../shared/src/cache_manager.c 24 cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/cache 25 cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) 26 27 EXTRA_PROGRAMS += cache_g.rel 28 CLEANFILES += cache_g.rel 29 cache_g_rel_SOURCES = $(cache_rel_SOURCES) 30 cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/cache 31 cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) 32 33 noinst_DATA += cache$(LIB_VARIANT).rel 34 38 35 ## misc 39 40 misc_C_FILES = misc/memcpy.c misc/m68kidle.c41 misc_OBJECTS = $(misc_C_FILES:misc/%.c=misc/$(ARCH)/%.$(OBJEXT))42 36 43 37 # gcc doesn't recognize difference between the cpu32 and cpu32+ so we have to … … 49 43 endif 50 44 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) 45 EXTRA_PROGRAMS += misc.rel 46 CLEANFILES += misc.rel 47 misc_rel_SOURCES = misc/memcpy.c misc/m68kidle.c 48 misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(M68K_CPPFLAGS) 49 misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) 50 51 EXTRA_PROGRAMS += misc_g.rel 52 CLEANFILES += misc_g.rel 53 misc_g_rel_SOURCES = $(misc_rel_SOURCES) 54 misc_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(M68K_CPPFLAGS) 55 misc_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) 56 57 noinst_DATA += misc$(LIB_VARIANT).rel 58 endif 58 59 59 60 ## -- 60 61 all-local: $(PREINSTALL_FILES) 61 62 63 PREINSTALL_DIRS = 62 64 PREINSTALL_FILES = 63 65 66 if shared 64 67 $(PROJECT_INCLUDE)/libcpu/$(dirstamp): 65 68 @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu 66 69 @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) 67 PREINSTALL_ FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)70 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) 68 71 69 72 $(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) … … 71 74 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h 72 75 73 CLEANFILES = $(PREINSTALL_FILES) 76 endif 77 78 CLEANFILES += $(PREINSTALL_FILES) 79 DISTCLEANFILES = $(PREINSTALL_DIRS) 74 80 75 81 include $(top_srcdir)/../../../automake/local.am
Note: See TracChangeset
for help on using the changeset viewer.