RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

build: Merge zlib/Makefile.am

Browse Source
This commit is contained in:
Sebastian Huber
2018-10-04 17:58:48 +02:00
parent 7f0eac3047
commit a40bb03d72
3 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cpukit/Makefile.am
View File

@@ -1215,9 +1215,6 @@ _SUBDIRS += libnetworking
_SUBDIRS += libmisc _SUBDIRS += libmisc
_SUBDIRS += wrapup _SUBDIRS += wrapup
# other libraries
_SUBDIRS += zlib
project_lib_LIBRARIES += libftpd.a project_lib_LIBRARIES += libftpd.a
$(PROJECT_LIB)/libftpd.a: libftpd.a $(PROJECT_LIB)/libftpd.a: libftpd.a
@@ -1292,6 +1289,29 @@ libjffs2_a_CPPFLAGS =
libjffs2_a_CPPFLAGS += $(AM_CPPFLAGS) libjffs2_a_CPPFLAGS += $(AM_CPPFLAGS)
libjffs2_a_CPPFLAGS += -I$(srcdir)/libfs/src/jffs2/include 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 if LIBNETWORKING
project_lib_LIBRARIES += libnfs.a project_lib_LIBRARIES += libnfs.a

1
cpukit/configure.ac
View File

@@ -497,7 +497,6 @@ score/cpu/x86_64/Makefile
score/cpu/no_cpu/Makefile score/cpu/no_cpu/Makefile
libnetworking/Makefile libnetworking/Makefile
libmisc/Makefile libmisc/Makefile
zlib/Makefile
wrapup/Makefile]) wrapup/Makefile])
AC_OUTPUT AC_OUTPUT

26
cpukit/zlib/Makefile.am
View File

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