summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-11-20 07:38:31 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-11-20 07:38:31 +0000
commit0fa54a0be5be116d83c8ebfb22549dbe4b35ab45 (patch)
tree32d23c5060f01d1e6c6baab7fc28fa4a404a9ee3
parent738a9ae8e7f9faaf3128c36895973b06015897f9 (diff)
downloadrtems-0fa54a0be5be116d83c8ebfb22549dbe4b35ab45.tar.bz2
2003-11-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* capture/config.h: Remove. * capture/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * cpuuse/config.h: Remove. * cpuuse/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * devnull/config.h: Remove. * devnull/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * dummy/config.h: Remove. * dummy/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * dumpbuf/config.h: Remove. * dumpbuf/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * monitor/config.h: Remove. * monitor/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * mw-fb/config.h: Remove. * mw-fb/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * rtmonuse/config.h: Remove. * rtmonuse/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * serdbg/config.h: Remove. * serdbg/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * shell/config.h: Remove. * shell/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * stackchk/config.h: Remove. * stackchk/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir). * untar/config.h: Remove. * untar/Makefile.am: Remove config.h. AM_CPPFLAGS += -I$(top_builddir).
-rw-r--r--cpukit/libmisc/ChangeLog39
-rw-r--r--cpukit/libmisc/capture/Makefile.am4
-rw-r--r--cpukit/libmisc/capture/config.h5
-rw-r--r--cpukit/libmisc/cpuuse/Makefile.am4
-rw-r--r--cpukit/libmisc/cpuuse/config.h5
-rw-r--r--cpukit/libmisc/devnull/Makefile.am4
-rw-r--r--cpukit/libmisc/devnull/config.h5
-rw-r--r--cpukit/libmisc/dummy/Makefile.am4
-rw-r--r--cpukit/libmisc/dummy/config.h5
-rw-r--r--cpukit/libmisc/dumpbuf/Makefile.am4
-rw-r--r--cpukit/libmisc/dumpbuf/config.h5
-rw-r--r--cpukit/libmisc/monitor/Makefile.am4
-rw-r--r--cpukit/libmisc/monitor/config.h5
-rw-r--r--cpukit/libmisc/mw-fb/Makefile.am4
-rw-r--r--cpukit/libmisc/mw-fb/config.h5
-rw-r--r--cpukit/libmisc/rtmonuse/Makefile.am4
-rw-r--r--cpukit/libmisc/rtmonuse/config.h5
-rw-r--r--cpukit/libmisc/serdbg/Makefile.am4
-rw-r--r--cpukit/libmisc/serdbg/config.h5
-rw-r--r--cpukit/libmisc/shell/Makefile.am4
-rw-r--r--cpukit/libmisc/shell/config.h5
-rw-r--r--cpukit/libmisc/stackchk/Makefile.am5
-rw-r--r--cpukit/libmisc/stackchk/config.h5
-rw-r--r--cpukit/libmisc/untar/Makefile.am4
-rw-r--r--cpukit/libmisc/untar/config.h5
25 files changed, 65 insertions, 83 deletions
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index 8153398b8a..7fbe479981 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,42 @@
+2003-11-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * capture/config.h: Remove.
+ * capture/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * cpuuse/config.h: Remove.
+ * cpuuse/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * devnull/config.h: Remove.
+ * devnull/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * dummy/config.h: Remove.
+ * dummy/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * dumpbuf/config.h: Remove.
+ * dumpbuf/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * monitor/config.h: Remove.
+ * monitor/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * mw-fb/config.h: Remove.
+ * mw-fb/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * rtmonuse/config.h: Remove.
+ * rtmonuse/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * serdbg/config.h: Remove.
+ * serdbg/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * shell/config.h: Remove.
+ * shell/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * stackchk/config.h: Remove.
+ * stackchk/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+ * untar/config.h: Remove.
+ * untar/Makefile.am: Remove config.h.
+ AM_CPPFLAGS += -I$(top_builddir).
+
2003-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* capture/capture-cli.c: Reflect new rtems_monitor_command_arg_t.
diff --git a/cpukit/libmisc/capture/Makefile.am b/cpukit/libmisc/capture/Makefile.am
index e58ff61a43..571fedc73d 100644
--- a/cpukit/libmisc/capture/Makefile.am
+++ b/cpukit/libmisc/capture/Makefile.am
@@ -12,11 +12,11 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_rtems_HEADERS = capture.h capture-cli.h
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/capture/config.h b/cpukit/libmisc/capture/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/capture/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am
index 068da9d0f6..19b81b7893 100644
--- a/cpukit/libmisc/cpuuse/Makefile.am
+++ b/cpukit/libmisc/cpuuse/Makefile.am
@@ -13,11 +13,11 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_rtems_HEADERS = cpuuse.h
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/cpuuse/config.h b/cpukit/libmisc/cpuuse/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/cpuuse/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/devnull/Makefile.am b/cpukit/libmisc/devnull/Makefile.am
index 35b3cb460f..10b97fdcf0 100644
--- a/cpukit/libmisc/devnull/Makefile.am
+++ b/cpukit/libmisc/devnull/Makefile.am
@@ -13,11 +13,11 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_rtems_HEADERS = devnull.h
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/devnull/config.h b/cpukit/libmisc/devnull/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/devnull/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am
index cd514f21cd..41bae5f18a 100644
--- a/cpukit/libmisc/dummy/Makefile.am
+++ b/cpukit/libmisc/dummy/Makefile.am
@@ -9,11 +9,11 @@ LIB = $(ARCH)/$(LIBNAME).a
C_FILES = dummy.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
#
# (OPTIONAL) Add local stuff here using +=
#
diff --git a/cpukit/libmisc/dummy/config.h b/cpukit/libmisc/dummy/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/dummy/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am
index 12fbb667db..c844b67070 100644
--- a/cpukit/libmisc/dumpbuf/Makefile.am
+++ b/cpukit/libmisc/dumpbuf/Makefile.am
@@ -13,11 +13,11 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_rtems_HEADERS = dumpbuf.h
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/dumpbuf/config.h b/cpukit/libmisc/dumpbuf/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/dumpbuf/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am
index d111656297..a5dba7296f 100644
--- a/cpukit/libmisc/monitor/Makefile.am
+++ b/cpukit/libmisc/monitor/Makefile.am
@@ -22,11 +22,13 @@ endif
include_rtems_HEADERS = monitor.h
-noinst_HEADERS = config.h symbols.h
+noinst_HEADERS = symbols.h
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/monitor/config.h b/cpukit/libmisc/monitor/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/monitor/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/mw-fb/Makefile.am b/cpukit/libmisc/mw-fb/Makefile.am
index 4321bbe27d..378ec032f7 100644
--- a/cpukit/libmisc/mw-fb/Makefile.am
+++ b/cpukit/libmisc/mw-fb/Makefile.am
@@ -13,11 +13,11 @@ OBJS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
include_rtems_HEADERS = mw_fb.h mw_uid.h
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/mw-fb/config.h b/cpukit/libmisc/mw-fb/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/mw-fb/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/rtmonuse/Makefile.am b/cpukit/libmisc/rtmonuse/Makefile.am
index 96bdacdbf4..efdfd5509b 100644
--- a/cpukit/libmisc/rtmonuse/Makefile.am
+++ b/cpukit/libmisc/rtmonuse/Makefile.am
@@ -13,11 +13,11 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_rtems_HEADERS = rtmonuse.h
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/rtmonuse/config.h b/cpukit/libmisc/rtmonuse/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/rtmonuse/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/serdbg/Makefile.am b/cpukit/libmisc/serdbg/Makefile.am
index f0b84c0e29..e09d24b8dc 100644
--- a/cpukit/libmisc/serdbg/Makefile.am
+++ b/cpukit/libmisc/serdbg/Makefile.am
@@ -15,11 +15,11 @@ include_HEADERS = serdbgcnf.h serdbg.h termios_printk_cnf.h \
termios_printk.h
endif
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
diff --git a/cpukit/libmisc/serdbg/config.h b/cpukit/libmisc/serdbg/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/serdbg/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/shell/Makefile.am b/cpukit/libmisc/shell/Makefile.am
index 60b863bed1..b0c0702109 100644
--- a/cpukit/libmisc/shell/Makefile.am
+++ b/cpukit/libmisc/shell/Makefile.am
@@ -15,11 +15,11 @@ if LIBSHELL
include_rtems_HEADERS = shell.h
endif
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/shell/config.h b/cpukit/libmisc/shell/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/shell/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/stackchk/Makefile.am b/cpukit/libmisc/stackchk/Makefile.am
index 9abd656c19..bdf3b523cd 100644
--- a/cpukit/libmisc/stackchk/Makefile.am
+++ b/cpukit/libmisc/stackchk/Makefile.am
@@ -13,12 +13,13 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_rtems_HEADERS = stackchk.h
-noinst_HEADERS = config.h
-noinst_HEADERS += internal.h
+noinst_HEADERS = internal.h
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
+AM_CPPFLAGS += -I$(top_builddir)
+
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
diff --git a/cpukit/libmisc/stackchk/config.h b/cpukit/libmisc/stackchk/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/stackchk/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libmisc/untar/Makefile.am b/cpukit/libmisc/untar/Makefile.am
index 41ab36dbc7..8bddd54d1c 100644
--- a/cpukit/libmisc/untar/Makefile.am
+++ b/cpukit/libmisc/untar/Makefile.am
@@ -13,8 +13,6 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_rtems_HEADERS = untar.h
-noinst_HEADERS = config.h
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
@@ -23,6 +21,8 @@ $(PROJECT_INCLUDE)/rtems:
$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
+AM_CPPFLAGS += -I$(top_builddir)
+
#
# (OPTIONAL) Add local stuff here using +=
#
diff --git a/cpukit/libmisc/untar/config.h b/cpukit/libmisc/untar/config.h
deleted file mode 100644
index 09fe652e2c..0000000000
--- a/cpukit/libmisc/untar/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* HACK:
- * Pull-in RTEMS global config-header cpuopts.h as local config.h
- */
-
-#include <rtems/score/cpuopts.h>