diff options
Diffstat (limited to '')
28 files changed, 170 insertions, 121 deletions
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog index 72d0610696..8416aca5c8 100644 --- a/cpukit/libmisc/ChangeLog +++ b/cpukit/libmisc/ChangeLog @@ -1,5 +1,49 @@ 2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Remove (Merged into ../configure.ac). + * Makefile.am: + Reflect having merged configure.ac into ../configure.ac. + * capture/config.h: New. + * capture/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * cpuuse/config.h: New. + * cpuuse/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * devnull/config.h: New. + * devnull/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * dummy/config.h: New. + * dummy/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * dumpbuf/config.h: New. + * dumpbuf/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * monitor/config.h: New. + * monitor/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * mw-fb/config.h: New. + * mw-fb/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * rtmonuse/config.h: New. + * rtmonuse/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * serdbg/config.h: New. + * serdbg/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * shell/config.h: New. + * shell/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * stackchk/config.h: New. + * stackchk/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * untar/config.h: New. + * untar/Makefile.am: Add config.h. + Reflect having merged configure.ac into ../configure.ac. + * wrapup/Makefile.am: + Reflect having merged configure.ac into ../configure.ac. + +2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * capture/capture-cli.c: Add config-header support. * capture/capture.c: Add config-header support. * cpuuse/cpuuse.c: Add config-header support. diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index faf9e9c5b9..fd45f3a725 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -2,12 +2,10 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../aclocal - SUBDIRS = capture cpuuse devnull dummy dumpbuf monitor mw-fb shell \ rtmonuse serdbg stackchk untar 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/cpukit/libmisc/capture/Makefile.am b/cpukit/libmisc/capture/Makefile.am index d1c3bcb762..e58ff61a43 100644 --- a/cpukit/libmisc/capture/Makefile.am +++ b/cpukit/libmisc/capture/Makefile.am @@ -12,8 +12,10 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = capture.h capture-cli.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -36,4 +38,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) EXTRA_DIST = README capture.c capture-cli.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/capture/config.h b/cpukit/libmisc/capture/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/capture/config.h @@ -0,0 +1,5 @@ +/* HACK: + * Pull-in RTEMS global config-header cpuopts.h as local config.h + */ + +#include <rtems/score/cpuopts.h> diff --git a/cpukit/libmisc/configure.ac b/cpukit/libmisc/configure.ac deleted file mode 100644 index 22d828f112..0000000000 --- a/cpukit/libmisc/configure.ac +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.57) -AC_INIT([rtems-cpukit-libmisc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([dumpbuf]) -RTEMS_TOP(../..) - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) -AM_MAINTAINER_MODE - -RTEMS_ENABLE_BARE - -RTEMS_ENV_RTEMSCPU -RTEMS_CHECK_CPU -RTEMS_CANONICAL_HOST - -RTEMS_PROG_CC_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS - -RTEMS_CHECK_MULTIPROCESSING - -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") - -# shell/* wants to assign file descriptors to stdio file descriptors. -AC_MSG_CHECKING([for assignable stdio]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [#include <stdio.h>], - [stdin = fopen("/tmp", "r")])], - [HAVE_ASSIGNABLE_STDIO=yes], - [HAVE_ASSIGNABLE_STDIO=no]) -AC_MSG_RESULT([$HAVE_ASSIGNABLE_STDIO]) - -# serdbg exploits weak symbols -AC_CACHE_CHECK([whether $CC supports function __attribute__((weak))], -[rtems_cv_cc_attribute_weak],[ - AS_IF([test x"$GCC" = xyes],[ - save_CFLAGS=$CFLAGS - CFLAGS=-Werror]) - - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( - [void myfunc(char c) __attribute__ ((weak)); - void myfunc(char c) {}], - [])], - [rtems_cv_cc_attribute_weak=yes], - [rtems_cv_cc_attribute_weak=no]) - - AS_IF([test x"$GCC" = xyes],[ - CFLAGS=$save_CFLAGS]) -]) - -AM_CONDITIONAL([LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"]) -AM_CONDITIONAL([LIBSERDBG],[test x"$rtems_cv_cc_attribute_weak" = x"yes"]) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -cpuuse/Makefile -shell/Makefile -devnull/Makefile -dummy/Makefile -dumpbuf/Makefile -monitor/Makefile -rtmonuse/Makefile -serdbg/Makefile -stackchk/Makefile -capture/Makefile -untar/Makefile -mw-fb/Makefile -wrapup/Makefile -]) -AC_OUTPUT diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am index d9ad23f351..068da9d0f6 100644 --- a/cpukit/libmisc/cpuuse/Makefile.am +++ b/cpukit/libmisc/cpuuse/Makefile.am @@ -13,8 +13,10 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = cpuuse.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -37,4 +39,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) EXTRA_DIST = README cpuuse.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/cpuuse/config.h b/cpukit/libmisc/cpuuse/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/cpuuse/config.h @@ -0,0 +1,5 @@ +/* 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 2094adf7e4..35b3cb460f 100644 --- a/cpukit/libmisc/devnull/Makefile.am +++ b/cpukit/libmisc/devnull/Makefile.am @@ -13,8 +13,10 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = devnull.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -37,4 +39,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) EXTRA_DIST = devnull.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/devnull/config.h b/cpukit/libmisc/devnull/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/devnull/config.h @@ -0,0 +1,5 @@ +/* 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 d267f5b095..cd514f21cd 100644 --- a/cpukit/libmisc/dummy/Makefile.am +++ b/cpukit/libmisc/dummy/Makefile.am @@ -9,8 +9,10 @@ LIB = $(ARCH)/$(LIBNAME).a C_FILES = dummy.c OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -25,4 +27,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) EXTRA_DIST = README dummy.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/dummy/config.h b/cpukit/libmisc/dummy/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/dummy/config.h @@ -0,0 +1,5 @@ +/* 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 29156eb970..12fbb667db 100644 --- a/cpukit/libmisc/dumpbuf/Makefile.am +++ b/cpukit/libmisc/dumpbuf/Makefile.am @@ -13,8 +13,10 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = dumpbuf.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -37,4 +39,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) EXTRA_DIST = dumpbuf.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/dumpbuf/config.h b/cpukit/libmisc/dumpbuf/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/dumpbuf/config.h @@ -0,0 +1,5 @@ +/* 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 c41d70bfbb..68245791f2 100644 --- a/cpukit/libmisc/monitor/Makefile.am +++ b/cpukit/libmisc/monitor/Makefile.am @@ -22,8 +22,10 @@ endif include_rtems_HEADERS = monitor.h symbols.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: $(mkinstalldirs) $@ @@ -49,4 +51,4 @@ EXTRA_DIST = README mon-command.c mon-config.c mon-dname.c mon-driver.c \ mon-object.c mon-prmisc.c mon-queue.c mon-server.c mon-symbols.c \ mon-task.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/monitor/config.h b/cpukit/libmisc/monitor/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/monitor/config.h @@ -0,0 +1,5 @@ +/* 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 30b180b161..4321bbe27d 100644 --- a/cpukit/libmisc/mw-fb/Makefile.am +++ b/cpukit/libmisc/mw-fb/Makefile.am @@ -13,8 +13,10 @@ OBJS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) include_rtems_HEADERS = mw_fb.h mw_uid.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -37,4 +39,4 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES) EXTRA_DIST = $(C_FILES) -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/mw-fb/config.h b/cpukit/libmisc/mw-fb/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/mw-fb/config.h @@ -0,0 +1,5 @@ +/* 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 2298ffe45f..96bdacdbf4 100644 --- a/cpukit/libmisc/rtmonuse/Makefile.am +++ b/cpukit/libmisc/rtmonuse/Makefile.am @@ -13,8 +13,10 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = rtmonuse.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -37,4 +39,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) EXTRA_DIST = rtmonuse.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/rtmonuse/config.h b/cpukit/libmisc/rtmonuse/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/rtmonuse/config.h @@ -0,0 +1,5 @@ +/* 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 9b297c3964..f0b84c0e29 100644 --- a/cpukit/libmisc/serdbg/Makefile.am +++ b/cpukit/libmisc/serdbg/Makefile.am @@ -10,14 +10,15 @@ LIB = $(ARCH)/$(LIBNAME).a C_FILES = serdbg.c serdbgio.c termios_printk.c OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -noinst_HEADERS = if LIBSERDBG include_HEADERS = serdbgcnf.h serdbg.h termios_printk_cnf.h \ termios_printk.h endif -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ @@ -43,4 +44,4 @@ endif EXTRA_DIST = README serdbg.c serdbgio.c serdbgcnf.h serdbg.h \ termios_printk.c termios_printk.h termios_printk_cnf.h -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/serdbg/config.h b/cpukit/libmisc/serdbg/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/serdbg/config.h @@ -0,0 +1,5 @@ +/* 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 c31be9bba7..60b863bed1 100644 --- a/cpukit/libmisc/shell/Makefile.am +++ b/cpukit/libmisc/shell/Makefile.am @@ -15,8 +15,10 @@ if LIBSHELL include_rtems_HEADERS = shell.h endif -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -41,4 +43,4 @@ endif EXTRA_DIST = README shell.c cmds.c shell.h -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/shell/config.h b/cpukit/libmisc/shell/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/shell/config.h @@ -0,0 +1,5 @@ +/* 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 84e813d8b0..9abd656c19 100644 --- a/cpukit/libmisc/stackchk/Makefile.am +++ b/cpukit/libmisc/stackchk/Makefile.am @@ -11,11 +11,13 @@ LIB = $(ARCH)/$(LIBNAME).a C_FILES = check.c OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -noinst_HEADERS = internal.h include_rtems_HEADERS = stackchk.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h +noinst_HEADERS += internal.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -38,4 +40,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) EXTRA_DIST = README check.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/stackchk/config.h b/cpukit/libmisc/stackchk/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/stackchk/config.h @@ -0,0 +1,5 @@ +/* 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 66cbbd4a14..41ab36dbc7 100644 --- a/cpukit/libmisc/untar/Makefile.am +++ b/cpukit/libmisc/untar/Makefile.am @@ -13,8 +13,10 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_rtems_HEADERS = untar.h -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +noinst_HEADERS = config.h + +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -37,4 +39,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) EXTRA_DIST = README untar.c -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/untar/config.h b/cpukit/libmisc/untar/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libmisc/untar/config.h @@ -0,0 +1,5 @@ +/* HACK: + * Pull-in RTEMS global config-header cpuopts.h as local config.h + */ + +#include <rtems/score/cpuopts.h> diff --git a/cpukit/libmisc/wrapup/Makefile.am b/cpukit/libmisc/wrapup/Makefile.am index 99573ec9fc..3b2e1d633c 100644 --- a/cpukit/libmisc/wrapup/Makefile.am +++ b/cpukit/libmisc/wrapup/Makefile.am @@ -4,8 +4,8 @@ LIB = $(ARCH)/libmisc.a -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am TMP_LIBS = ../monitor/$(ARCH)/libmonitor.a TMP_LIBS += ../untar/$(ARCH)/libuntar.a @@ -43,4 +43,4 @@ $(LIB): $(TMP_LIBS) all-local: $(ARCH) $(LIB) -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am |