RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-11-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* capture/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* serdbg/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* serdbg/serdbgio.c: Add #include <unistd.h>.
	* shell/Makefile.am: Add RTEMS_LIBSHELL conditional.
	* wrapup/Makefile.am: Add RTEMS_LIBSHELL conditional.
	* configure.ac: Check for stdio assignments.
	Add RTEMS_LIBSHELL conditional.
This commit is contained in:
Ralf Corsepius
2002-11-14 12:13:26 +00:00
parent 6a31b7c044
commit 22b689b274
14 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/libmisc/ChangeLog
View File

@@ -1,3 +1,13 @@
2002-11-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* capture/Makefile.am: Remove AUTOMAKE_OPTIONS.
* serdbg/Makefile.am: Remove AUTOMAKE_OPTIONS.
* serdbg/serdbgio.c: Add #include <unistd.h>.
* shell/Makefile.am: Add RTEMS_LIBSHELL conditional.
* wrapup/Makefile.am: Add RTEMS_LIBSHELL conditional.
* configure.ac: Check for stdio assignments.
Add RTEMS_LIBSHELL conditional.
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* stackchk/check.c: Removed warnings.

2
c/src/libmisc/capture/Makefile.am
View File

@@ -2,8 +2,6 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtemsdir = $(includedir)/rtems
LIBNAME = libcapture-tmp

12
c/src/libmisc/configure.ac
View File

@@ -29,6 +29,18 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
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])
AM_CONDITIONAL([RTEMS_LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
cpuuse/Makefile

2
c/src/libmisc/serdbg/Makefile.am
View File

@@ -2,8 +2,6 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtemsdir = $(includedir)/rtems
LIBNAME = libserdbg-tmp

1
c/src/libmisc/serdbg/serdbgio.c
View File

@@ -28,6 +28,7 @@
#include <rtems.h>
#include <rtems/libio_.h>
#include <errno.h>
#include <unistd.h> /* close */
#include <stdio.h>
#include <fcntl.h>
#include <termios.h>

6
c/src/libmisc/shell/Makefile.am
View File

@@ -11,7 +11,9 @@ LIB = $(ARCH)/$(LIBNAME).a
C_FILES = cmds.c shell.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
if RTEMS_LIBSHELL
include_rtems_HEADERS = shell.h
endif
OBJS = $(C_O_FILES)
@@ -34,10 +36,12 @@ $(LIB): $(OBJS)
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
if RTEMS_LIBSHELL
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
endif
.PRECIOUS: $(LIB)
EXTRA_DIST = README shell.c cmds.c
EXTRA_DIST = README shell.c cmds.c shell.h
include $(top_srcdir)/../../../automake/local.am

8
c/src/libmisc/wrapup/Makefile.am
View File

@@ -11,11 +11,15 @@ include $(top_srcdir)/../../../automake/lib.am
## XXX temporarily remove this from the list because it causes a
## XXX number of BSPs to not link "main(){}" used by autoconf
## ../serdbg/$(ARCH)/libserdbg-tmp.a
if RTEMS_LIBSHELL
RTEMS_LIBSHELL = ../shell/$(ARCH)/libshell-tmp.a
endif
TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \
../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \
../cpuuse/$(ARCH)/libcpuuse-tmp.a ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
../shell/$(ARCH)/libshell-tmp.a ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a \
$(RTEMS_LIBSHELL) ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a \
../devnull/$(ARCH)/libdevnull-tmp.a ../dummy/$(ARCH)/libdummy-tmp.a \
../mw-fb/$(ARCH)/libmw-fb-tmp.a ../capture/$(ARCH)/libcapture-tmp.a

10
cpukit/libmisc/ChangeLog
View File

@@ -1,3 +1,13 @@
2002-11-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* capture/Makefile.am: Remove AUTOMAKE_OPTIONS.
* serdbg/Makefile.am: Remove AUTOMAKE_OPTIONS.
* serdbg/serdbgio.c: Add #include <unistd.h>.
* shell/Makefile.am: Add RTEMS_LIBSHELL conditional.
* wrapup/Makefile.am: Add RTEMS_LIBSHELL conditional.
* configure.ac: Check for stdio assignments.
Add RTEMS_LIBSHELL conditional.
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* stackchk/check.c: Removed warnings.

2
cpukit/libmisc/capture/Makefile.am
View File

@@ -2,8 +2,6 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtemsdir = $(includedir)/rtems
LIBNAME = libcapture-tmp

12
cpukit/libmisc/configure.ac
View File

@@ -29,6 +29,18 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
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])
AM_CONDITIONAL([RTEMS_LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
cpuuse/Makefile

2
cpukit/libmisc/serdbg/Makefile.am
View File

@@ -2,8 +2,6 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtemsdir = $(includedir)/rtems
LIBNAME = libserdbg-tmp

1
cpukit/libmisc/serdbg/serdbgio.c
View File

@@ -28,6 +28,7 @@
#include <rtems.h>
#include <rtems/libio_.h>
#include <errno.h>
#include <unistd.h> /* close */
#include <stdio.h>
#include <fcntl.h>
#include <termios.h>

6
cpukit/libmisc/shell/Makefile.am
View File

@@ -11,7 +11,9 @@ LIB = $(ARCH)/$(LIBNAME).a
C_FILES = cmds.c shell.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
if RTEMS_LIBSHELL
include_rtems_HEADERS = shell.h
endif
OBJS = $(C_O_FILES)
@@ -34,10 +36,12 @@ $(LIB): $(OBJS)
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
if RTEMS_LIBSHELL
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
endif
.PRECIOUS: $(LIB)
EXTRA_DIST = README shell.c cmds.c
EXTRA_DIST = README shell.c cmds.c shell.h
include $(top_srcdir)/../../../automake/local.am

8
cpukit/libmisc/wrapup/Makefile.am
View File

@@ -11,11 +11,15 @@ include $(top_srcdir)/../../../automake/lib.am
## XXX temporarily remove this from the list because it causes a
## XXX number of BSPs to not link "main(){}" used by autoconf
## ../serdbg/$(ARCH)/libserdbg-tmp.a
if RTEMS_LIBSHELL
RTEMS_LIBSHELL = ../shell/$(ARCH)/libshell-tmp.a
endif
TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \
../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \
../cpuuse/$(ARCH)/libcpuuse-tmp.a ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
../shell/$(ARCH)/libshell-tmp.a ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a \
$(RTEMS_LIBSHELL) ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a \
../devnull/$(ARCH)/libdevnull-tmp.a ../dummy/$(ARCH)/libdummy-tmp.a \
../mw-fb/$(ARCH)/libmw-fb-tmp.a ../capture/$(ARCH)/libcapture-tmp.a