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.
This commit is contained in:
Ralf Corsepius
2003-07-08 10:39:58 +00:00
parent e604ab66c5
commit 2cc936789e
28 changed files with 170 additions and 121 deletions
+44
View File
@@ -1,3 +1,47 @@
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.
+2 -4
View File
@@ -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
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
-76
View File
@@ -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
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -4
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+6 -4
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+5 -3
View File
@@ -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
+5
View File
@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>
+3 -3
View File
@@ -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