From 5a8a05b2c9fce41cda685361e13a11bbf605676d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 24 Jan 2003 12:05:44 +0000 Subject: 2002-01-24 Ralf Corsepius * configure.ac: Add check for weak function attribute. Remove AM_CONDITIONAL([RTEMS_LIBSHELL]. Add AM_CONDITIONAL(LIBSHELL), AM_CONDITIONAL(LIBSERDBG). * capture/Makefile.am: Use *.a instead of *-tmp.a. * cpuuse/Makefile.am: Use *.a instead of *-tmp.a. * devnull/Makefile.am: Use *.a instead of *-tmp.a. * dummy/Makefile.am: Use *.a instead of *-tmp.a. * dumpbuf/Makefile.am: Use *.a instead of *-tmp.a. * monitor/Makefile.am: Use *.a instead of *-tmp.a. * mw-fb/Makefile.am: Use *.a instead of *-tmp.a. * rtmonuse/Makefile.am: Use *.a instead of *-tmp.a. * serdbg/Makefile.am: Use *.a instead of *-tmp.a. Build iff LIBSERDBG is true. * shell/Makefile.am: Use *.a instead of *-tmp.a. Build iff LIBSHELL is true. * stackchk/Makefile.am: Use *.a instead of *-tmp.a. * untar/Makefile.am: Use *.a instead of *-tmp.a. * wrapup/Makefile.am: Reflect changes above. --- cpukit/libmisc/ChangeLog | 21 +++++++++++++++++++++ cpukit/libmisc/capture/Makefile.am | 2 +- cpukit/libmisc/configure.ac | 22 +++++++++++++++++++++- cpukit/libmisc/cpuuse/Makefile.am | 2 +- cpukit/libmisc/devnull/Makefile.am | 2 +- cpukit/libmisc/dummy/Makefile.am | 2 +- cpukit/libmisc/dumpbuf/Makefile.am | 2 +- cpukit/libmisc/monitor/Makefile.am | 2 +- cpukit/libmisc/mw-fb/Makefile.am | 2 +- cpukit/libmisc/rtmonuse/Makefile.am | 2 +- cpukit/libmisc/serdbg/Makefile.am | 6 +++++- cpukit/libmisc/shell/Makefile.am | 6 +++--- cpukit/libmisc/stackchk/Makefile.am | 2 +- cpukit/libmisc/untar/Makefile.am | 2 +- cpukit/libmisc/wrapup/Makefile.am | 27 +++++++++++++++++---------- 15 files changed, 77 insertions(+), 25 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog index f5a82c4c53..6e1cd9c48d 100644 --- a/cpukit/libmisc/ChangeLog +++ b/cpukit/libmisc/ChangeLog @@ -1,3 +1,24 @@ +2002-01-24 Ralf Corsepius + + * configure.ac: Add check for weak function attribute. + Remove AM_CONDITIONAL([RTEMS_LIBSHELL]. + Add AM_CONDITIONAL(LIBSHELL), AM_CONDITIONAL(LIBSERDBG). + * capture/Makefile.am: Use *.a instead of *-tmp.a. + * cpuuse/Makefile.am: Use *.a instead of *-tmp.a. + * devnull/Makefile.am: Use *.a instead of *-tmp.a. + * dummy/Makefile.am: Use *.a instead of *-tmp.a. + * dumpbuf/Makefile.am: Use *.a instead of *-tmp.a. + * monitor/Makefile.am: Use *.a instead of *-tmp.a. + * mw-fb/Makefile.am: Use *.a instead of *-tmp.a. + * rtmonuse/Makefile.am: Use *.a instead of *-tmp.a. + * serdbg/Makefile.am: Use *.a instead of *-tmp.a. + Build iff LIBSERDBG is true. + * shell/Makefile.am: Use *.a instead of *-tmp.a. + Build iff LIBSHELL is true. + * stackchk/Makefile.am: Use *.a instead of *-tmp.a. + * untar/Makefile.am: Use *.a instead of *-tmp.a. + * wrapup/Makefile.am: Reflect changes above. + 2002-12-12 Ralf Corsepius * configure.ac: Require autoconf-2.57+automake-1.7.2. diff --git a/cpukit/libmisc/capture/Makefile.am b/cpukit/libmisc/capture/Makefile.am index 769e8f935b..d1c3bcb762 100644 --- a/cpukit/libmisc/capture/Makefile.am +++ b/cpukit/libmisc/capture/Makefile.am @@ -4,7 +4,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libcapture-tmp +LIBNAME = libcapture LIB = $(ARCH)/$(LIBNAME).a C_FILES = capture.c capture-cli.c diff --git a/cpukit/libmisc/configure.ac b/cpukit/libmisc/configure.ac index 4f86e53f19..72c63de255 100644 --- a/cpukit/libmisc/configure.ac +++ b/cpukit/libmisc/configure.ac @@ -36,7 +36,27 @@ AC_COMPILE_IFELSE( [HAVE_ASSIGNABLE_STDIO=no]) AC_MSG_RESULT([$HAVE_ASSIGNABLE_STDIO]) -AM_CONDITIONAL([RTEMS_LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"]) +# serdbg exploits weak symbols +AC_CACHE_CHECK([whether $CC supports function __attribute__((weak))], +[rtems_cv_cc_attribute_weak],[ + AS_IF([test $GCC = yes],[ + 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 $GCC = yes],[ + 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 diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am index 1962e863c7..d9ad23f351 100644 --- a/cpukit/libmisc/cpuuse/Makefile.am +++ b/cpukit/libmisc/cpuuse/Makefile.am @@ -5,7 +5,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libcpuuse-tmp +LIBNAME = libcpuuse LIB = $(ARCH)/$(LIBNAME).a C_FILES = cpuuse.c diff --git a/cpukit/libmisc/devnull/Makefile.am b/cpukit/libmisc/devnull/Makefile.am index 5f62a07b4a..2094adf7e4 100644 --- a/cpukit/libmisc/devnull/Makefile.am +++ b/cpukit/libmisc/devnull/Makefile.am @@ -5,7 +5,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libdevnull-tmp +LIBNAME = libdevnull LIB = $(ARCH)/$(LIBNAME).a C_FILES = devnull.c diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am index 73b4cb966a..4384478889 100644 --- a/cpukit/libmisc/dummy/Makefile.am +++ b/cpukit/libmisc/dummy/Makefile.am @@ -3,7 +3,7 @@ ## -LIBNAME = libdummy-tmp +LIBNAME = libdummy LIB = $(ARCH)/$(LIBNAME).a C_FILES = dummy.c diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am index ff0152da2d..29156eb970 100644 --- a/cpukit/libmisc/dumpbuf/Makefile.am +++ b/cpukit/libmisc/dumpbuf/Makefile.am @@ -5,7 +5,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libdumpbuf-tmp +LIBNAME = libdumpbuf LIB = $(ARCH)/$(LIBNAME).a C_FILES = dumpbuf.c diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am index d45e52eaea..c41d70bfbb 100644 --- a/cpukit/libmisc/monitor/Makefile.am +++ b/cpukit/libmisc/monitor/Makefile.am @@ -5,7 +5,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libmonitor-tmp +LIBNAME = libmonitor LIB = $(ARCH)/$(LIBNAME).a # We only build multiprocessing related files if HAS_MP was defined diff --git a/cpukit/libmisc/mw-fb/Makefile.am b/cpukit/libmisc/mw-fb/Makefile.am index 06f2b75ef4..30b180b161 100644 --- a/cpukit/libmisc/mw-fb/Makefile.am +++ b/cpukit/libmisc/mw-fb/Makefile.am @@ -5,7 +5,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libmw-fb-tmp +LIBNAME = libmw-fb LIB = ${ARCH}/${LIBNAME}.a C_FILES = mw_fb.c mw_uid.c diff --git a/cpukit/libmisc/rtmonuse/Makefile.am b/cpukit/libmisc/rtmonuse/Makefile.am index e033125cc6..2298ffe45f 100644 --- a/cpukit/libmisc/rtmonuse/Makefile.am +++ b/cpukit/libmisc/rtmonuse/Makefile.am @@ -5,7 +5,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = librtmonuse-tmp +LIBNAME = librtmonuse LIB = $(ARCH)/$(LIBNAME).a C_FILES = rtmonuse.c diff --git a/cpukit/libmisc/serdbg/Makefile.am b/cpukit/libmisc/serdbg/Makefile.am index 04f641d54b..9b297c3964 100644 --- a/cpukit/libmisc/serdbg/Makefile.am +++ b/cpukit/libmisc/serdbg/Makefile.am @@ -4,15 +4,17 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libserdbg-tmp +LIBNAME = libserdbg 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 @@ -32,7 +34,9 @@ $(LIB): $(OBJS) PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) +if LIBSERDBG all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) +endif .PRECIOUS: $(LIB) diff --git a/cpukit/libmisc/shell/Makefile.am b/cpukit/libmisc/shell/Makefile.am index 391a92f361..c31be9bba7 100644 --- a/cpukit/libmisc/shell/Makefile.am +++ b/cpukit/libmisc/shell/Makefile.am @@ -5,13 +5,13 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libshell-tmp +LIBNAME = libshell LIB = $(ARCH)/$(LIBNAME).a C_FILES = cmds.c shell.c OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -if RTEMS_LIBSHELL +if LIBSHELL include_rtems_HEADERS = shell.h endif @@ -33,7 +33,7 @@ $(LIB): $(OBJS) PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) -if RTEMS_LIBSHELL +if LIBSHELL all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) endif diff --git a/cpukit/libmisc/stackchk/Makefile.am b/cpukit/libmisc/stackchk/Makefile.am index 4a73216626..84e813d8b0 100644 --- a/cpukit/libmisc/stackchk/Makefile.am +++ b/cpukit/libmisc/stackchk/Makefile.am @@ -5,7 +5,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libstackchk-tmp +LIBNAME = libstackchk LIB = $(ARCH)/$(LIBNAME).a C_FILES = check.c diff --git a/cpukit/libmisc/untar/Makefile.am b/cpukit/libmisc/untar/Makefile.am index 900bfb6de8..66cbbd4a14 100644 --- a/cpukit/libmisc/untar/Makefile.am +++ b/cpukit/libmisc/untar/Makefile.am @@ -5,7 +5,7 @@ include_rtemsdir = $(includedir)/rtems -LIBNAME = libuntar-tmp +LIBNAME = libuntar LIB = $(ARCH)/$(LIBNAME).a C_FILES = untar.c diff --git a/cpukit/libmisc/wrapup/Makefile.am b/cpukit/libmisc/wrapup/Makefile.am index ca804a6b09..99573ec9fc 100644 --- a/cpukit/libmisc/wrapup/Makefile.am +++ b/cpukit/libmisc/wrapup/Makefile.am @@ -7,20 +7,27 @@ LIB = $(ARCH)/libmisc.a include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/lib.am -## XXX temporarily remove this from the list because it causes a +TMP_LIBS = ../monitor/$(ARCH)/libmonitor.a +TMP_LIBS += ../untar/$(ARCH)/libuntar.a +TMP_LIBS += ../stackchk/$(ARCH)/libstackchk.a +TMP_LIBS += ../cpuuse/$(ARCH)/libcpuuse.a +TMP_LIBS += ../rtmonuse/$(ARCH)/librtmonuse.a + +## 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 LIBSERDBG +# TMP_LIBS += ../serdbg/$(ARCH)/libserdbg.a +# endif -if RTEMS_LIBSHELL -RTEMS_LIBSHELL = ../shell/$(ARCH)/libshell-tmp.a +if LIBSHELL +TMP_LIBS += ../shell/$(ARCH)/libshell.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 \ - $(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 +TMP_LIBS += ../dumpbuf/$(ARCH)/libdumpbuf.a +TMP_LIBS += ../devnull/$(ARCH)/libdevnull.a +TMP_LIBS += ../dummy/$(ARCH)/libdummy.a +TMP_LIBS += ../mw-fb/$(ARCH)/libmw-fb.a +TMP_LIBS += ../capture/$(ARCH)/libcapture.a # # (OPTIONAL) Add local stuff here using += -- cgit v1.2.3