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

* Makefile.am: Eliminate VPATH.
This commit is contained in:
Ralf Corsepius
2003-12-16 10:43:54 +00:00
parent 05180c14ab
commit 6d2aa69f33
2 changed files with 16 additions and 12 deletions

View File

@@ -1,3 +1,7 @@
2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Eliminate VPATH.
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.

View File

@@ -4,32 +4,32 @@
ACLOCAL_AMFLAGS = -I ../../../aclocal
VPATH = @srcdir@:@srcdir@/../shared/src
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
C_FILES = cache.c cache_aligned_malloc.c cache_manager.c displayCpu.c \
page.c
C_FILES = cache.c displayCpu.c page.c
common_C_FILES = ../shared/src/cache_aligned_malloc.c
common_C_FILES += ../shared/src/cache_manager.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS += $(common_C_FILES:../shared/src/%.c=$(ARCH)/%.$(OBJEXT))
include_libcpudir = $(includedir)/libcpu
noinst_HEADERS = cache_.h
include_libcpu_HEADERS = cpu.h cpuModel.h cache.h
include_libcpu_HEADERS = cpu.h cpuModel.h
include_libcpu_HEADERS += ../shared/include/cache.h
S_FILES = cpuModel.S idtr.S
OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
$(ARCH)/%.$(OBJEXT): ../shared/src/%.c $(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
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 cpu.h cpuModel.S cpuModel.h displayCpu.c idt.c \
idtr.S page.c registers.h
@@ -47,7 +47,7 @@ $(PROJECT_INCLUDE)/libcpu/cpuModel.h: cpuModel.h $(PROJECT_INCLUDE)/libcpu/$(dir
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuModel.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuModel.h
$(PROJECT_INCLUDE)/libcpu/cache.h: cache.h $(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