diff options
| -rwxr-xr-x | c/src/exec/libcsupport/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/exec/libcsupport/Makefile.am | 8 | ||||
| -rw-r--r-- | c/src/exec/libcsupport/src/Makefile.am | 8 | ||||
| -rw-r--r-- | cpukit/libcsupport/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libcsupport/Makefile.am | 8 |
5 files changed, 24 insertions, 12 deletions
diff --git a/c/src/exec/libcsupport/ChangeLog b/c/src/exec/libcsupport/ChangeLog index 4742722db7..ad07546102 100755 --- a/c/src/exec/libcsupport/ChangeLog +++ b/c/src/exec/libcsupport/ChangeLog @@ -1,3 +1,9 @@ +2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Include $(top_srcdir)/../automake/*.am. + Use ../aclocal. + * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. + 2001-05-24 Joel Sherrill <joel@OARcorp.com> * src/.cvsignore: New file. diff --git a/c/src/exec/libcsupport/Makefile.am b/c/src/exec/libcsupport/Makefile.am index d4d8283ace..a21c7beb30 100644 --- a/c/src/exec/libcsupport/Makefile.am +++ b/c/src/exec/libcsupport/Makefile.am @@ -2,9 +2,9 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal +ACLOCAL_AMFLAGS = -I ../aclocal -include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../automake/multilib.am SUBDIRS = . src @@ -87,5 +87,5 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \ ## General stuff all-local: $(PREINSTALL_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/exec/libcsupport/src/Makefile.am b/c/src/exec/libcsupport/src/Makefile.am index c7d956c8e1..35b84626d4 100644 --- a/c/src/exec/libcsupport/src/Makefile.am +++ b/c/src/exec/libcsupport/src/Makefile.am @@ -2,9 +2,9 @@ ## $Id$ ## -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 LIBNAME = libcsupport LIB = ${ARCH}/${LIBNAME}.a @@ -86,4 +86,4 @@ DOC_FILES = TODO CASES EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ $(UNIX_C_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog index a725ec84cb..87c7a6e97c 100644 --- a/cpukit/libcsupport/ChangeLog +++ b/cpukit/libcsupport/ChangeLog @@ -1,4 +1,10 @@ +2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Include $(top_srcdir)/../automake/*.am. + Use ../aclocal. + * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. + 2001-05-24 Joel Sherrill <joel@OARcorp.com> * src/.cvsignore: New file. diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index d4d8283ace..a21c7beb30 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -2,9 +2,9 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal +ACLOCAL_AMFLAGS = -I ../aclocal -include $(top_srcdir)/../../../../automake/multilib.am +include $(top_srcdir)/../automake/multilib.am SUBDIRS = . src @@ -87,5 +87,5 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \ ## General stuff all-local: $(PREINSTALL_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 |