From 4a8754d990caa88160d306f47a89d3b8a539733c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 16 Dec 2003 11:55:57 +0000 Subject: 2003-12-12 Ralf Corsepius * shared/cache/Makefile.am: Remove. * shared/misc/Makefile.am: Remove. * shared/Makefile.am: Merge-in the Makefile.ams above. Eliminate VPATH. * configure.ac: Reflect changes above. --- c/src/lib/libcpu/m68k/ChangeLog | 8 +++ c/src/lib/libcpu/m68k/configure.ac | 2 - c/src/lib/libcpu/m68k/shared/Makefile.am | 68 +++++++++++++++++++++++++- c/src/lib/libcpu/m68k/shared/cache/Makefile.am | 39 --------------- c/src/lib/libcpu/m68k/shared/misc/Makefile.am | 26 ---------- 5 files changed, 74 insertions(+), 69 deletions(-) delete mode 100644 c/src/lib/libcpu/m68k/shared/cache/Makefile.am delete mode 100644 c/src/lib/libcpu/m68k/shared/misc/Makefile.am (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog index 8f87d3a1b9..93e45fb654 100644 --- a/c/src/lib/libcpu/m68k/ChangeLog +++ b/c/src/lib/libcpu/m68k/ChangeLog @@ -1,3 +1,11 @@ +2003-12-12 Ralf Corsepius + + * shared/cache/Makefile.am: Remove. + * shared/misc/Makefile.am: Remove. + * shared/Makefile.am: Merge-in the Makefile.ams above. + Eliminate VPATH. + * configure.ac: Reflect changes above. + 2003-12-12 Ralf Corsepius * shared/cache/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/m68k/configure.ac b/c/src/lib/libcpu/m68k/configure.ac index 7215769955..67c3745843 100644 --- a/c/src/lib/libcpu/m68k/configure.ac +++ b/c/src/lib/libcpu/m68k/configure.ac @@ -53,8 +53,6 @@ esac # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile shared/Makefile -shared/cache/Makefile -shared/misc/Makefile m68040/Makefile m68040/fpsp/Makefile]) AC_OUTPUT diff --git a/c/src/lib/libcpu/m68k/shared/Makefile.am b/c/src/lib/libcpu/m68k/shared/Makefile.am index 2dcb0ab47e..0b1a3f5dc4 100644 --- a/c/src/lib/libcpu/m68k/shared/Makefile.am +++ b/c/src/lib/libcpu/m68k/shared/Makefile.am @@ -2,7 +2,71 @@ ## $Id$ ## -SUBDIRS = cache misc +CLEANDIRS = +EXTRA_DIST = +noinst_DATA = + +include $(top_srcdir)/../../../automake/compile.am +include $(top_srcdir)/../../../automake/lib.am + +## cache + +cache_C_FILES = cache/cache.c +EXTRA_DIST += $(cache_C_FILES) +cache_OBJECTS = $(cache_C_FILES:cache/%.c:cache/$(ARCH)/%.$(OBJEXT)) + +common_C_FILES = ../../shared/src/cache_aligned_malloc.c +common_C_FILES += ../../shared/src/cache_manager.c +cache_OBJECTS += \ + $(common_C_FILES:../../shared/src/%.c=cache/$(ARCH)/%.$(OBJEXT)) + +cache/$(ARCH)/$(dirstamp): + @$(mkdir_p) cache/$(ARCH) + @: > cache/$(ARCH)/$(dirstamp) +cache/$(ARCH)/%.$(OBJEXT): cache/%.c cache/$(ARCH)/$(dirstamp) + ${COMPILE} -I$(srcdir)/cache $(M68K_CPPFLAGS) -o $@ -c $< +cache/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c cache/$(ARCH)/$(dirstamp) + ${COMPILE} -I$(srcdir)/cache $(M68K_CPPFLAGS) -o $@ -c $< +CLEANDIRS += cache/o-optimize cache/o-debug +noinst_DATA += $(cache_OBJECTS) + +include_libcpudir = $(includedir)/libcpu + +noinst_HEADERS = cache/cache_.h +include_libcpu_HEADERS = ../../shared/include/cache.h + +## misc + +misc_C_FILES = misc/memcpy.c misc/m68kidle.c +misc_OBJECTS = $(misc_C_FILES:misc/%.c=misc/$(ARCH)/%.$(OBJEXT)) + +# gcc doesn't recognize difference between the cpu32 and cpu32+ so we have to +if mcpu32p +M68K_CPPFLAGS = -D__mcpu32p__ +endif +if mcf5272 +M68K_CPPFLAGS = -Dmcf5272 +endif + +misc/$(ARCH)/$(dirstamp): + @$(mkdir_p) misc/$(ARCH) + @: > misc/$(ARCH)/$(dirstamp) +misc/$(ARCH)/%.$(OBJEXT): misc/%.c misc/$(ARCH)/$(dirstamp) + ${COMPILE} $(M68K_CPPFLAGS) -o $@ -c $< +CLEANDIRS += misc/o-optimize misc/o-debug +noinst_DATA += $(misc_OBJECTS) + +## -- +all-local: $(PREINSTALL_FILES) + +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/libcpu/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu + @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + +$(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/shared/cache/Makefile.am b/c/src/lib/libcpu/m68k/shared/cache/Makefile.am deleted file mode 100644 index 6495263b58..0000000000 --- a/c/src/lib/libcpu/m68k/shared/cache/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../../shared/src - -C_FILES = cache.c cache_aligned_malloc.c cache_manager.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include_libcpudir = $(includedir)/libcpu - -noinst_HEADERS = cache_.h -include_libcpu_HEADERS = cache.h - -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - -AM_CPPFLAGS += -I$(srcdir) - -cache.h: $(top_srcdir)/../shared/include/cache.h - cp $< $@ - -all-local: $(PREINSTALL_FILES) $(OBJS) - -CLEANFILES = cache.h - -EXTRA_DIST = cache.c cache_.h - -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/cache.h: cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/shared/misc/Makefile.am b/c/src/lib/libcpu/m68k/shared/misc/Makefile.am deleted file mode 100644 index 15748392a1..0000000000 --- a/c/src/lib/libcpu/m68k/shared/misc/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - -C_FILES = memcpy.c m68kidle.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - -# gcc doesn't recognize difference between the cpu32 and cpu32+ so we have to -if mcpu32p -M68K_CPPFLAGS = -D__mcpu32p__ -endif - -if mcf5272 -M68K_CPPFLAGS = -Dmcf5272 -endif - -AM_CPPFLAGS += $(M68K_CPPFLAGS) - -all-local: $(OBJS) - -EXTRA_DIST = memcpy.c m68kidle.c - -include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3