From 6e183f18cd60f6bacb48afc8c88c49b51a844112 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 17 Jun 2002 09:10:09 +0000 Subject: 2002-06-17 Ralf Corsepius * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. * Makefile.am: Include $(top_srcdir)/../automake/*.am. Use ../aclocal. * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. --- c/src/exec/libblock/ChangeLog | 7 +++++++ c/src/exec/libblock/Makefile.am | 6 +++--- c/src/exec/libblock/include/Makefile.am | 2 +- c/src/exec/libblock/src/Makefile.am | 8 ++++---- 4 files changed, 15 insertions(+), 8 deletions(-) (limited to 'c/src/exec/libblock') diff --git a/c/src/exec/libblock/ChangeLog b/c/src/exec/libblock/ChangeLog index 334b3656fe..6f41061803 100644 --- a/c/src/exec/libblock/ChangeLog +++ b/c/src/exec/libblock/ChangeLog @@ -1,3 +1,10 @@ +2002-06-17 Ralf Corsepius + + * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * Makefile.am: Include $(top_srcdir)/../automake/*.am. + Use ../aclocal. + * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. + 2002-05-18 Ralf Corsepius Move from c/src/libblock to c/src/exec/libblock diff --git a/c/src/exec/libblock/Makefile.am b/c/src/exec/libblock/Makefile.am index ee557d4518..1f68c561e5 100644 --- a/c/src/exec/libblock/Makefile.am +++ b/c/src/exec/libblock/Makefile.am @@ -2,11 +2,11 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal +ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = include src EXTRA_DIST = README -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/exec/libblock/include/Makefile.am b/c/src/exec/libblock/include/Makefile.am index 7b54845bfb..723f5907c0 100644 --- a/c/src/exec/libblock/include/Makefile.am +++ b/c/src/exec/libblock/include/Makefile.am @@ -19,4 +19,4 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/libblock/src/Makefile.am b/c/src/exec/libblock/src/Makefile.am index 8fd33f6bcd..9c1e45ad29 100644 --- a/c/src/exec/libblock/src/Makefile.am +++ b/c/src/exec/libblock/src/Makefile.am @@ -13,9 +13,9 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) SRCS = $(C_FILES) OBJS = $(C_O_FILES) -include $(top_srcdir)/../../../../automake/multilib.am -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +include $(top_srcdir)/../automake/multilib.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/lib.am AM_CFLAGS += $(LIBC_DEFINES) @@ -29,4 +29,4 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am -- cgit v1.2.3