summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--c/src/libchip/ChangeLog8
-rw-r--r--c/src/libchip/Makefile.am4
-rw-r--r--c/src/libchip/ide/Makefile.am8
-rw-r--r--c/src/libchip/network/Makefile.am6
-rw-r--r--c/src/libchip/rtc/Makefile.am6
-rw-r--r--c/src/libchip/serial/Makefile.am6
6 files changed, 23 insertions, 15 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog
index f0953bd8d4..67bddc7b84 100644
--- a/c/src/libchip/ChangeLog
+++ b/c/src/libchip/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+ ide/Makefile.am: Reflect having moved automake.
+ network/Makefile.am: Reflect having moved automake.
+ rtc/Makefile.am: Reflect having moved automake.
+ serial/Makefile.am: Reflect having moved automake.
+
2003-07-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ide/Makefile.am, network/Makefile.am, rtc/Makefile.am,
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index 918853462a..8500678fcf 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -4,5 +4,5 @@
SUBDIRS = rtc serial network ide
-include $(top_srcdir)/../../automake/subdirs.am
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/automake/subdirs.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/libchip/ide/Makefile.am b/c/src/libchip/ide/Makefile.am
index 4289eb3777..0c2e87e5d2 100644
--- a/c/src/libchip/ide/Makefile.am
+++ b/c/src/libchip/ide/Makefile.am
@@ -13,8 +13,8 @@ noinst_HEADERS = ata_internal.h
OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../automake/compile.am
-include $(top_srcdir)/../../automake/lib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
$(include_ide_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
@@ -36,5 +36,5 @@ endif
EXTRA_DIST = $(C_FILES)
-include $(top_srcdir)/../../automake/subdirs.am
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/automake/subdirs.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am
index eafa47b6b2..5d228c98be 100644
--- a/c/src/libchip/network/Makefile.am
+++ b/c/src/libchip/network/Makefile.am
@@ -9,8 +9,8 @@ LIB = $(ARCH)/$(LIBNAME).a
C_FILES = cs8900.c dec21140.c i82586.c sonic.c if_fxp.c elnk.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include $(top_srcdir)/../../automake/compile.am
-include $(top_srcdir)/../../automake/lib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
$(PROJECT_INCLUDE)/libchip:
@$(mkinstalldirs) $@
@@ -50,4 +50,4 @@ endif
EXTRA_DIST = README README.cs8900 README.dec21140 README.i82586 README.sonic \
cs8900.c cs8900.c.bsp dec21140.c i82586.c if_fxp.c sonic.c
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/libchip/rtc/Makefile.am b/c/src/libchip/rtc/Makefile.am
index 2e59036faf..f2c1544b01 100644
--- a/c/src/libchip/rtc/Makefile.am
+++ b/c/src/libchip/rtc/Makefile.am
@@ -13,8 +13,8 @@ C_FILES = rtcprobe.c icm7170.c icm7170_reg.c icm7170_reg2.c icm7170_reg4.c \
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include $(top_srcdir)/../../automake/compile.am
-include $(top_srcdir)/../../automake/lib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
@@ -42,4 +42,4 @@ DOC_FILES = README.ds1643 README.icm7170 README.m48t08 README.m48t18 STATUS
EXTRA_DIST = $(C_FILES) $(DOC_FILES)
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/c/src/libchip/serial/Makefile.am b/c/src/libchip/serial/Makefile.am
index 132e002e41..226a01d795 100644
--- a/c/src/libchip/serial/Makefile.am
+++ b/c/src/libchip/serial/Makefile.am
@@ -13,8 +13,8 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
noinst_HEADERS = mc68681_p.h ns16550_p.h z85c30_p.h
-include $(top_srcdir)/../../automake/compile.am
-include $(top_srcdir)/../../automake/lib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
$(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
@@ -42,4 +42,4 @@ DOC_FILES = README.mc68681 README.ns16550 README.xr88681 README.z85c30 \
EXTRA_DIST = $(C_FILES) $(DOC_FILES)
-include $(top_srcdir)/../../automake/local.am
+include $(top_srcdir)/automake/local.am