build: Merge mghttpd/Makefile.am

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

cpukit/configure.ac

@@ -502,7 +502,6 @@ libmisc/Makefile
 zlib/Makefile
 telnetd/Makefile
 pppd/Makefile
-mghttpd/Makefile
 wrapup/Makefile])
 
 AC_OUTPUT

cpukit/mghttpd/Makefile.am

@@ -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