diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-06-17 09:10:53 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-06-17 09:10:53 +0000 |
| commit | 7077c8778b483c2eb720d3b7929bcaf62ca61a97 (patch) | |
| tree | f523183f881f0d7b11f1548f78c68603b4fa8613 /c/src/exec/libfs | |
| parent | 2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-7077c8778b483c2eb720d3b7929bcaf62ca61a97.tar.bz2 | |
2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* src/dosfs/Makefile.am: Include $(top_srcdir)/../automake/*.am.
* src/Makefile.am: Include $(top_srcdir)/../automake/*.am.
* src/imfs/Makefile.am: Include $(top_srcdir)/../automake/*.am.
* Makefile.am: Include $(top_srcdir)/../automake/*.am.
Use ../aclocal.
* wrapup/Makefile.am: Include $(top_srcdir)/../automake/*.am.
Diffstat (limited to 'c/src/exec/libfs')
| -rw-r--r-- | c/src/exec/libfs/ChangeLog | 9 | ||||
| -rw-r--r-- | c/src/exec/libfs/Makefile.am | 6 | ||||
| -rw-r--r-- | c/src/exec/libfs/src/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/exec/libfs/src/dosfs/Makefile.am | 8 | ||||
| -rw-r--r-- | c/src/exec/libfs/src/imfs/Makefile.am | 8 | ||||
| -rw-r--r-- | c/src/exec/libfs/wrapup/Makefile.am | 8 |
6 files changed, 26 insertions, 17 deletions
diff --git a/c/src/exec/libfs/ChangeLog b/c/src/exec/libfs/ChangeLog index 91b452cb77..0d04cb69a7 100644 --- a/c/src/exec/libfs/ChangeLog +++ b/c/src/exec/libfs/ChangeLog @@ -1,3 +1,12 @@ +2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * src/dosfs/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * src/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * src/imfs/Makefile.am: Include $(top_srcdir)/../automake/*.am. + * Makefile.am: Include $(top_srcdir)/../automake/*.am. + Use ../aclocal. + * wrapup/Makefile.am: Include $(top_srcdir)/../automake/*.am. + 2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> Move from c/src/libfs to c/src/exec/libfs diff --git a/c/src/exec/libfs/Makefile.am b/c/src/exec/libfs/Makefile.am index b24f15c4a4..b1682363c5 100644 --- a/c/src/exec/libfs/Makefile.am +++ b/c/src/exec/libfs/Makefile.am @@ -2,11 +2,11 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal +ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = src wrapup 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/libfs/src/Makefile.am b/c/src/exec/libfs/src/Makefile.am index 315c9e9bd6..dff205eaaa 100644 --- a/c/src/exec/libfs/src/Makefile.am +++ b/c/src/exec/libfs/src/Makefile.am @@ -5,5 +5,5 @@ SUBDIRS = imfs dosfs -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/libfs/src/dosfs/Makefile.am b/c/src/exec/libfs/src/dosfs/Makefile.am index f34b4776f5..9bb265386a 100644 --- a/c/src/exec/libfs/src/dosfs/Makefile.am +++ b/c/src/exec/libfs/src/dosfs/Makefile.am @@ -3,9 +3,9 @@ ## -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 INCLUDES = -I../.. @@ -52,4 +52,4 @@ TMPINSTALL_FILES += $(H_FILES) EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/libfs/src/imfs/Makefile.am b/c/src/exec/libfs/src/imfs/Makefile.am index 87aa91b5aa..760e29025b 100644 --- a/c/src/exec/libfs/src/imfs/Makefile.am +++ b/c/src/exec/libfs/src/imfs/Makefile.am @@ -32,9 +32,9 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) include_HEADERS = imfs.h -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 PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) @@ -63,4 +63,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/c/src/exec/libfs/wrapup/Makefile.am b/c/src/exec/libfs/wrapup/Makefile.am index 8dce90f71a..55a6098fc1 100644 --- a/c/src/exec/libfs/wrapup/Makefile.am +++ b/c/src/exec/libfs/wrapup/Makefile.am @@ -6,9 +6,9 @@ LIBNAME = libfs LIB = $(ARCH)/$(LIBNAME).a -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 IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a @@ -39,4 +39,4 @@ all-local: $(ARCH) $(LIB) $(TMPINSTALL_FILES) .PRECIOUS: $(LIB) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am |