[PATCH 26/31] build: Merge zlib/Makefile.am

[Sebastian Huber]

---
 cpukit/Makefile.am      | 26 +++++++++++++++++++++++---
 cpukit/configure.ac     |  1 -
 cpukit/zlib/Makefile.am | 26 --------------------------
 3 files changed, 23 insertions(+), 30 deletions(-)
 delete mode 100644 cpukit/zlib/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 8b3c5938ca..f26f620d1e 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -1221,9 +1221,6 @@ _SUBDIRS += libnetworking
 _SUBDIRS += libmisc
 _SUBDIRS += wrapup
 
-# other libraries
-_SUBDIRS += zlib
-
 project_lib_LIBRARIES += libftpd.a
 
 $(PROJECT_LIB)/libftpd.a: libftpd.a
@@ -1298,6 +1295,29 @@ libjffs2_a_CPPFLAGS =
 libjffs2_a_CPPFLAGS += $(AM_CPPFLAGS)
 libjffs2_a_CPPFLAGS += -I$(srcdir)/libfs/src/jffs2/include
 
+project_lib_LIBRARIES += libz.a
+
+$(PROJECT_LIB)/libz.a: libz.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libz.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libz.a
+
+libz_a_SOURCES =
+libz_a_SOURCES += zlib/adler32.c
+libz_a_SOURCES += zlib/compress.c
+libz_a_SOURCES += zlib/crc32.c
+libz_a_SOURCES += zlib/deflate.c
+libz_a_SOURCES += zlib/gzclose.c
+libz_a_SOURCES += zlib/gzlib.c
+libz_a_SOURCES += zlib/gzread.c
+libz_a_SOURCES += zlib/gzwrite.c
+libz_a_SOURCES += zlib/infback.c
+libz_a_SOURCES += zlib/inffast.c
+libz_a_SOURCES += zlib/inflate.c
+libz_a_SOURCES += zlib/inftrees.c
+libz_a_SOURCES += zlib/trees.c
+libz_a_SOURCES += zlib/uncompr.c
+libz_a_SOURCES += zlib/zutil.c
+
 if LIBNETWORKING
 
 project_lib_LIBRARIES += libpppd.a
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 7f378d65ca..11d0af6461 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -497,7 +497,6 @@ score/cpu/x86_64/Makefile
 score/cpu/no_cpu/Makefile
 libnetworking/Makefile
 libmisc/Makefile
-zlib/Makefile
 wrapup/Makefile])
 
 AC_OUTPUT
diff --git a/cpukit/zlib/Makefile.am b/cpukit/zlib/Makefile.am
deleted file mode 100644
index f5a42cccb6..0000000000
--- a/cpukit/zlib/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-
-project_lib_LIBRARIES = libz.a
-
-$(PROJECT_LIB)/libz.a: libz.a
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libz.a
-TMPINSTALL_FILES = $(PROJECT_LIB)/libz.a
-
-
-libz_a_SOURCES = adler32.c
-libz_a_SOURCES += compress.c
-libz_a_SOURCES += crc32.c crc32.h
-libz_a_SOURCES += deflate.c deflate.h
-libz_a_SOURCES += gzclose.c gzguts.h gzlib.c gzread.c gzwrite.c
-libz_a_SOURCES += infback.c
-libz_a_SOURCES += inffast.c inffast.h
-libz_a_SOURCES += inffixed.h
-libz_a_SOURCES += inflate.c inflate.h
-libz_a_SOURCES += inftrees.c inftrees.h
-libz_a_SOURCES += trees.c trees.h
-libz_a_SOURCES += uncompr.c
-libz_a_SOURCES += zconf.h
-libz_a_SOURCES += zlib.h
-libz_a_SOURCES += zutil.c zutil.h
-
-include $(top_srcdir)/automake/local.am
-- 
2.16.4