diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-14 16:12:19 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-10 07:54:43 +0200 |
| commit | 028b0ced4c26847c31a65c6f5630182cc2f4e7cb (patch) | |
| tree | 5596f337820978f1a66f8bf0e994c8887dec8cf5 | |
| parent | build: Merge libstdthreads/Makefile.am (diff) | |
| download | rtems-028b0ced4c26847c31a65c6f5630182cc2f4e7cb.tar.bz2 | |
build: Merge mghttpd/Makefile.am
| -rw-r--r-- | cpukit/Makefile.am | 14 | ||||
| -rw-r--r-- | cpukit/configure.ac | 1 | ||||
| -rw-r--r-- | cpukit/mghttpd/Makefile.am | 15 |
3 files changed, 13 insertions, 17 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 51944da950..9e02e37959 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -624,7 +624,6 @@ _SUBDIRS += wrapup _SUBDIRS += zlib _SUBDIRS += telnetd _SUBDIRS += pppd -_SUBDIRS += mghttpd project_lib_LIBRARIES += libftpd.a @@ -703,6 +702,19 @@ libnfs_a_SOURCES += libfs/src/nfsclient/src/rpcio.c libnfs_a_SOURCES += libfs/src/nfsclient/src/sock_mbuf.c libnfs_a_SOURCES += libfs/src/nfsclient/src/xdr_mbuf.c +if HAS_PTHREADS + +project_lib_LIBRARIES += libmghttpd.a + +$(PROJECT_LIB)/libmghttpd.a: libmghttpd.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a +TMPINSTALL_FILES += $(PROJECT_LIB)/libmghttpd.a + +libmghttpd_a_SOURCES = +libmghttpd_a_SOURCES += mghttpd/mongoose.c + +endif + endif include $(top_srcdir)/automake/subdirs.am diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 25b1d0c1a8..576f39396e 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -502,7 +502,6 @@ libmisc/Makefile zlib/Makefile telnetd/Makefile pppd/Makefile -mghttpd/Makefile wrapup/Makefile]) AC_OUTPUT diff --git a/cpukit/mghttpd/Makefile.am b/cpukit/mghttpd/Makefile.am deleted file mode 100644 index 4f17609e29..0000000000 --- a/cpukit/mghttpd/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include $(top_srcdir)/automake/compile.am - -if LIBNETWORKING -if HAS_PTHREADS -project_lib_LIBRARIES = libmghttpd.a - -$(PROJECT_LIB)/libmghttpd.a: libmghttpd.a - $(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a -TMPINSTALL_FILES = $(PROJECT_LIB)/libmghttpd.a - -libmghttpd_a_SOURCES = mongoose.c mongoose.h -endif -endif - -include $(top_srcdir)/automake/local.am |