--- cpukit/Makefile.am | 18 +++++++++++++++++- cpukit/configure.ac | 1 - cpukit/mghttpd/Makefile.am | 15 --------------- 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 cpukit/mghttpd/Makefile.am
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 2e0298f46a..9bdd4c6d8a 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -630,7 +630,6 @@ _SUBDIRS += wrapup _SUBDIRS += zlib _SUBDIRS += telnetd _SUBDIRS += pppd -_SUBDIRS += mghttpd project_lib_LIBRARIES += libftpd.a @@ -693,6 +692,23 @@ libjffs2_a_CPPFLAGS = libjffs2_a_CPPFLAGS += $(AM_CPPFLAGS) libjffs2_a_CPPFLAGS += -I$(srcdir)/libfs/src/jffs2/include +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 = +libmghttpd_a_SOURCES += mghttpd/mongoose.c + +endif + +endif + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am include $(srcdir)/headers.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 -- 2.16.4 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
