From 42d865ce309f44cdc8e51a5931ecc022f5c03784 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 1 Dec 2003 11:22:29 +0000 Subject: 2003-12-01 Ralf Corsepius * Makefile.am: Reformat. Use dirstamps for preinstallation. --- c/src/lib/libcpu/i386/Makefile.am | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'c/src/lib/libcpu/i386/Makefile.am') diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index 9df67761ea..ec7792e367 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -6,7 +6,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal VPATH = @srcdir@:@srcdir@/../shared/src -C_FILES = cache.c cache_aligned_malloc.c cache_manager.c displayCpu.c page.c +C_FILES = cache.c cache_aligned_malloc.c cache_manager.c displayCpu.c \ + page.c OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_libcpudir = $(includedir)/libcpu @@ -22,18 +23,9 @@ include $(top_srcdir)/../../../automake/lib.am AM_CPPFLAGS += -I$(srcdir) -$(PROJECT_INCLUDE)/libcpu: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/libcpu/%.h: %.h - $(INSTALL_DATA) $< $@ - cache.h: $(top_srcdir)/../shared/include/cache.h cp $< $@ -PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \ - $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%) - all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) CLEANFILES = cache.h @@ -41,4 +33,23 @@ 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 +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/libcpu/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu + @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + +$(PROJECT_INCLUDE)/libcpu/cpu.h: cpu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpu.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpu.h + +$(PROJECT_INCLUDE)/libcpu/cpuModel.h: cpuModel.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(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) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h + include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3