RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2003-12-16 11:55:57 +00:00
parent 6702346fed
commit 4a8754d990
5 changed files with 74 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/lib/libcpu/m68k/ChangeLog
View File

@@ -1,3 +1,11 @@
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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 <corsepiu@faw.uni-ulm.de>
* shared/cache/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.

2
c/src/lib/libcpu/m68k/configure.ac
View File

@@ -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

68
c/src/lib/libcpu/m68k/shared/Makefile.am
View File

@@ -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

39
c/src/lib/libcpu/m68k/shared/cache/Makefile.am vendored
View File

@@ -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

26
c/src/lib/libcpu/m68k/shared/misc/Makefile.am
View File

@@ -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