diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-15 03:56:14 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-15 03:56:14 +0000 |
| commit | 7c5a840a84d4e1f1b2c7150a9b4d8c8f95a6cf49 (patch) | |
| tree | 6a9a6bc33ae4150a4d45d21693cd0b7c59cf0281 | |
| parent | 2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-7c5a840a84d4e1f1b2c7150a9b4d8c8f95a6cf49.tar.bz2 | |
2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove libnetworking/wrapup/Makefile.
* wrapup/Makefile.am: Reflect change to libnetworking/*.
Use libnetworking/*/lib*.a instead of libnetapps.a
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/wrapup/Makefile.am | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 96ff1cb5dd..65b6d40cbc 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,11 @@ 2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Remove libnetworking/wrapup/Makefile. + * wrapup/Makefile.am: Reflect change to libnetworking/*. + Use libnetworking/*/lib*.a instead of libnetapps.a + +2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS. Require automake-1.8.2. Add RTEMS_PROG_CCAS. diff --git a/c/src/configure.ac b/c/src/configure.ac index 39ef0e7e3e..f6ff2e79be 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -226,7 +226,6 @@ libnetworking/pppd/Makefile libnetworking/rtems_servers/Makefile libnetworking/rtems_telnetd/Makefile libnetworking/rtems_webserver/Makefile -libnetworking/wrapup/Makefile librdbg/Makefile librdbg/include/Makefile diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index efc4769393..9aee6922d8 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -17,7 +17,12 @@ SRCS += \ endif if HAS_NETWORKING -SRCS += ../libnetworking/wrapup/$(ARCH)/libnetapps.a +if HAS_POSIX +SRCS += ../libnetworking/rtems_webserver/libhttpd$(LIB_VARIANT).a +endif +SRCS += ../libnetworking/pppd/libpppd$(LIB_VARIANT).a +SRCS += ../libnetworking/rtems_servers/libftpd$(LIB_VARIANT).a +SRCS += ../libnetworking/rtems_telnetd/libtelnetd$(LIB_VARIANT).a endif if HAS_RDBG |