From 3e39b47d70027fd5ca18fac5dd9baa3000efe61c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 29 May 2002 17:01:22 +0000 Subject: 2002-05-29 Ralf Corsepius * configure.ac: Add libnetworking. * wrapup/Makefile.am: Ditto. --- c/src/exec/ChangeLog | 5 +++++ c/src/exec/configure.ac | 5 +++++ c/src/exec/wrapup/Makefile.am | 44 ++++++++++++++++++++++++++++++++++++++----- cpukit/ChangeLog | 5 +++++ cpukit/configure.ac | 5 +++++ cpukit/wrapup/Makefile.am | 44 ++++++++++++++++++++++++++++++++++++++----- 6 files changed, 98 insertions(+), 10 deletions(-) diff --git a/c/src/exec/ChangeLog b/c/src/exec/ChangeLog index 2dede5be2e..583308c468 100644 --- a/c/src/exec/ChangeLog +++ b/c/src/exec/ChangeLog @@ -1,3 +1,8 @@ +2002-05-29 Ralf Corsepius + + * configure.ac: Add libnetworking. + * wrapup/Makefile.am: Ditto. + 2002-05-18 Ralf Corsepius * configure.ac: Add libblock. Add libfs. Add AM_CONDITIONAL(UNIX). diff --git a/c/src/exec/configure.ac b/c/src/exec/configure.ac index 9858da24fe..225384afd5 100644 --- a/c/src/exec/configure.ac +++ b/c/src/exec/configure.ac @@ -19,6 +19,7 @@ RTEMS_ENABLE_POSIX RTEMS_ENABLE_ITRON RTEMS_ENABLE_INLINES RTEMS_ENABLE_RTEMS_DEBUG +RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSCPU RTEMS_CHECK_RTEMS_DEBUG @@ -36,6 +37,7 @@ RTEMS_CHECK_NEWLIB RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_POSIX_API(RTEMS_BSP) RTEMS_CHECK_ITRON_API(RTEMS_BSP) +RTEMS_CHECK_NETWORKING # If RTEMS macros are enabled, then use them. Otherwise, use inlines. AS_IF([test "$RTEMS_USE_MACROS" = "yes"], @@ -50,6 +52,7 @@ AC_SUBST(RTEMS_VERSION) AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes") AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes") +AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes") AS_IF([test x"$HAS_POSIX_API" = x"yes"], [AC_CONFIG_SUBDIRS([posix])] @@ -62,6 +65,8 @@ RTEMS_CPU_SUBDIRS([score/cpu]) AC_CONFIG_SUBDIRS([libcsupport]) AC_CONFIG_SUBDIRS([libblock]) AC_CONFIG_SUBDIRS([libfs]) +AS_IF([test x"$HAS_NETWORKING" = x"yes"], + [AC_CONFIG_SUBDIRS(libnetworking)]) RTEMS_DEFINE_POSIX_API RTEMS_DEFINE_ITRON_API diff --git a/c/src/exec/wrapup/Makefile.am b/c/src/exec/wrapup/Makefile.am index 4b574be1f2..66f9360ed1 100644 --- a/c/src/exec/wrapup/Makefile.am +++ b/c/src/exec/wrapup/Makefile.am @@ -4,7 +4,7 @@ LIBNAME = librtemscpu -LIB = $(ARCH)/$(LIBNAME).a +LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am @@ -31,17 +31,51 @@ LIBDOSFS_OBJS = $(wildcard ../libfs/src/dosfs/$(ARCH)/*.o) endif LIBIMFS_OBJS = $(wildcard ../libfs/src/imfs/$(ARCH)/*.o) +if HAS_NETWORKING +NETWORKING_OBJS = \ + ../libnetworking/wrapup/$(ARCH)/libnetworking.a +endif + OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) \ $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \ - $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) + $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) \ + $(NETWORKING_OBJS) $(LIB): ${OBJS} - $(make-library) + rm -f $@ + test -d $(ARCH) || mkdir $(ARCH) + rm -rf $(ARCH)/* + for f in $(OBJS); do \ + case $$f in \ + *.o | *.rel) \ + if test -f $(ARCH)/`basename $$f`; then \ + if cmp $$f $(ARCH)/`basename $$f`; then \ + true; \ + else \ + echo 1>&2 "ERROR -- `basename $$f` in multiple files"; \ + exit 1; \ + fi; \ + else \ + cp $$f $(ARCH)/; \ + chmod a-w $(ARCH)/`basename $$f`; \ + fi; \ + ;; \ + *.a) \ + cd $(ARCH); \ + $(AR) xv ../$$f || exit 1; \ + chmod a-w * ; \ + cd ..; \ + ;; \ + esac; \ + done + $(AR) rc $@ $(ARCH)/* + rm -f $(ARCH)/*.o + $(RANLIB) $@ TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ +#$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) +# $(INSTALL_DATA) $< $@ install-hook: $(LIB) @$(mkinstalldirs) $(libdir) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 2dede5be2e..583308c468 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2002-05-29 Ralf Corsepius + + * configure.ac: Add libnetworking. + * wrapup/Makefile.am: Ditto. + 2002-05-18 Ralf Corsepius * configure.ac: Add libblock. Add libfs. Add AM_CONDITIONAL(UNIX). diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 9858da24fe..225384afd5 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -19,6 +19,7 @@ RTEMS_ENABLE_POSIX RTEMS_ENABLE_ITRON RTEMS_ENABLE_INLINES RTEMS_ENABLE_RTEMS_DEBUG +RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSCPU RTEMS_CHECK_RTEMS_DEBUG @@ -36,6 +37,7 @@ RTEMS_CHECK_NEWLIB RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_POSIX_API(RTEMS_BSP) RTEMS_CHECK_ITRON_API(RTEMS_BSP) +RTEMS_CHECK_NETWORKING # If RTEMS macros are enabled, then use them. Otherwise, use inlines. AS_IF([test "$RTEMS_USE_MACROS" = "yes"], @@ -50,6 +52,7 @@ AC_SUBST(RTEMS_VERSION) AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes") AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes") +AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes") AS_IF([test x"$HAS_POSIX_API" = x"yes"], [AC_CONFIG_SUBDIRS([posix])] @@ -62,6 +65,8 @@ RTEMS_CPU_SUBDIRS([score/cpu]) AC_CONFIG_SUBDIRS([libcsupport]) AC_CONFIG_SUBDIRS([libblock]) AC_CONFIG_SUBDIRS([libfs]) +AS_IF([test x"$HAS_NETWORKING" = x"yes"], + [AC_CONFIG_SUBDIRS(libnetworking)]) RTEMS_DEFINE_POSIX_API RTEMS_DEFINE_ITRON_API diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 4b574be1f2..66f9360ed1 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -4,7 +4,7 @@ LIBNAME = librtemscpu -LIB = $(ARCH)/$(LIBNAME).a +LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am @@ -31,17 +31,51 @@ LIBDOSFS_OBJS = $(wildcard ../libfs/src/dosfs/$(ARCH)/*.o) endif LIBIMFS_OBJS = $(wildcard ../libfs/src/imfs/$(ARCH)/*.o) +if HAS_NETWORKING +NETWORKING_OBJS = \ + ../libnetworking/wrapup/$(ARCH)/libnetworking.a +endif + OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) \ $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \ - $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) + $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) \ + $(NETWORKING_OBJS) $(LIB): ${OBJS} - $(make-library) + rm -f $@ + test -d $(ARCH) || mkdir $(ARCH) + rm -rf $(ARCH)/* + for f in $(OBJS); do \ + case $$f in \ + *.o | *.rel) \ + if test -f $(ARCH)/`basename $$f`; then \ + if cmp $$f $(ARCH)/`basename $$f`; then \ + true; \ + else \ + echo 1>&2 "ERROR -- `basename $$f` in multiple files"; \ + exit 1; \ + fi; \ + else \ + cp $$f $(ARCH)/; \ + chmod a-w $(ARCH)/`basename $$f`; \ + fi; \ + ;; \ + *.a) \ + cd $(ARCH); \ + $(AR) xv ../$$f || exit 1; \ + chmod a-w * ; \ + cd ..; \ + ;; \ + esac; \ + done + $(AR) rc $@ $(ARCH)/* + rm -f $(ARCH)/*.o + $(RANLIB) $@ TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ +#$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) +# $(INSTALL_DATA) $< $@ install-hook: $(LIB) @$(mkinstalldirs) $(libdir) -- cgit v1.2.3