From 78c2a97196a1a03ae112e9049481c7a3f3ecf0ba Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 17 Jun 2002 09:07:32 +0000 Subject: 2002-06-17 Ralf Corsepius * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. * Makefile.am: Include $(top_srcdir)/../automake/*.am. Use ../aclocal. * inline/Makefile.am: Include $(top_srcdir)/../automake/*.am. * macros/Makefile.am: Include $(top_srcdir)/../automake/*.am. * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. --- c/src/exec/itron/ChangeLog | 9 +++++++++ c/src/exec/itron/Makefile.am | 6 +++--- c/src/exec/itron/include/Makefile.am | 2 +- c/src/exec/itron/inline/Makefile.am | 2 +- c/src/exec/itron/macros/Makefile.am | 2 +- c/src/exec/itron/src/Makefile.am | 8 ++++---- c/src/exec/posix/ChangeLog | 9 +++++++++ c/src/exec/posix/Makefile.am | 6 +++--- c/src/exec/posix/include/Makefile.am | 2 +- c/src/exec/posix/inline/Makefile.am | 2 +- c/src/exec/posix/macros/Makefile.am | 2 +- c/src/exec/posix/src/Makefile.am | 8 ++++---- 12 files changed, 38 insertions(+), 20 deletions(-) (limited to 'c/src') diff --git a/c/src/exec/itron/ChangeLog b/c/src/exec/itron/ChangeLog index b45b1dccca..df396492b2 100644 --- a/c/src/exec/itron/ChangeLog +++ b/c/src/exec/itron/ChangeLog @@ -1,3 +1,12 @@ +2002-06-17 Ralf Corsepius + + * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * Makefile.am: Include $(top_srcdir)/../automake/*.am. + Use ../aclocal. + * inline/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * macros/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. + 2001-04-22 Joel Sherrill * src/task.c (_ITRON_Task_User_extensions): Add new fields to diff --git a/c/src/exec/itron/Makefile.am b/c/src/exec/itron/Makefile.am index 95a95305e5..e76b696b26 100644 --- a/c/src/exec/itron/Makefile.am +++ b/c/src/exec/itron/Makefile.am @@ -2,9 +2,9 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal +ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = include inline macros src -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/itron/include/Makefile.am b/c/src/exec/itron/include/Makefile.am index 35019a5916..4d6f968519 100644 --- a/c/src/exec/itron/include/Makefile.am +++ b/c/src/exec/itron/include/Makefile.am @@ -52,4 +52,4 @@ EXTRA_DIST += rtems/itron/README ## General all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/itron/inline/Makefile.am b/c/src/exec/itron/inline/Makefile.am index 759735d7d4..c0d667c927 100644 --- a/c/src/exec/itron/inline/Makefile.am +++ b/c/src/exec/itron/inline/Makefile.am @@ -23,4 +23,4 @@ endif all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/itron/macros/Makefile.am b/c/src/exec/itron/macros/Makefile.am index d0b6a5ee33..954b38e39c 100644 --- a/c/src/exec/itron/macros/Makefile.am +++ b/c/src/exec/itron/macros/Makefile.am @@ -23,4 +23,4 @@ endif all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/itron/src/Makefile.am b/c/src/exec/itron/src/Makefile.am index b7339a2804..ea3ce9a24b 100644 --- a/c/src/exec/itron/src/Makefile.am +++ b/c/src/exec/itron/src/Makefile.am @@ -46,9 +46,9 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) 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_CPPFLAGS += -D__RTEMS_INSIDE__ @@ -59,4 +59,4 @@ UNUSED_C_FILES = cre_mbx.c del_mbx.c mboxtranslatereturncode.c network.c \ EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/posix/ChangeLog b/c/src/exec/posix/ChangeLog index d77050a84c..a28553ad2c 100644 --- a/c/src/exec/posix/ChangeLog +++ b/c/src/exec/posix/ChangeLog @@ -1,3 +1,12 @@ +2002-06-17 Ralf Corsepius + + * include/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * Makefile.am: Include $(top_srcdir)/../automake/*.am. + Use ../aclocal. + * inline/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * macros/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. + 2001-05-17 Joel Sherrill * macros/rtems/posix/mqueue.inl: Implemented missing routines diff --git a/c/src/exec/posix/Makefile.am b/c/src/exec/posix/Makefile.am index 95a95305e5..e76b696b26 100644 --- a/c/src/exec/posix/Makefile.am +++ b/c/src/exec/posix/Makefile.am @@ -2,9 +2,9 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal +ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = include inline macros src -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/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am index eb2edf1d82..46b1d374ca 100644 --- a/c/src/exec/posix/include/Makefile.am +++ b/c/src/exec/posix/include/Makefile.am @@ -52,4 +52,4 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = $(noinst_HEADERS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/posix/inline/Makefile.am b/c/src/exec/posix/inline/Makefile.am index b603b9be78..131ba6b783 100644 --- a/c/src/exec/posix/inline/Makefile.am +++ b/c/src/exec/posix/inline/Makefile.am @@ -23,4 +23,4 @@ endif all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/posix/macros/Makefile.am b/c/src/exec/posix/macros/Makefile.am index e4a04340a1..dbf40773f8 100644 --- a/c/src/exec/posix/macros/Makefile.am +++ b/c/src/exec/posix/macros/Makefile.am @@ -23,4 +23,4 @@ endif all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/posix/src/Makefile.am b/c/src/exec/posix/src/Makefile.am index c5437ee1b4..2bf552dc76 100644 --- a/c/src/exec/posix/src/Makefile.am +++ b/c/src/exec/posix/src/Makefile.am @@ -86,9 +86,9 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) 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 # # Add local stuff here using += @@ -109,4 +109,4 @@ not: EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am -- cgit v1.2.3