diff options
Diffstat (limited to 'Build/source/libs/zlib/Makefile.am')
| -rw-r--r-- | Build/source/libs/zlib/Makefile.am | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am index 44a3164d600..ba95b313a06 100644 --- a/Build/source/libs/zlib/Makefile.am +++ b/Build/source/libs/zlib/Makefile.am @@ -23,9 +23,6 @@ EXTRA_DIST = $(ZLIB_TREE) ## EXTRA_DIST += $(ZLIB_TREE)-PATCHES -## Prepare for switch zlib-1.2.3 -> zlib-1.2.5 -EXTRA_DIST += $(OTHER_TREE) $(OTHER_TREE)-PATCHES - # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` @@ -46,6 +43,11 @@ nodist_libz_a_SOURCES = \ $(ZLIB_TREE)/deflate.c \ $(ZLIB_TREE)/deflate.h \ $(ZLIB_TREE)/infback.c \ + $(ZLIB_TREE)/gzclose.c \ + $(ZLIB_TREE)/gzguts.h \ + $(ZLIB_TREE)/gzlib.c \ + $(ZLIB_TREE)/gzread.c \ + $(ZLIB_TREE)/gzwrite.c \ $(ZLIB_TREE)/inffast.c \ $(ZLIB_TREE)/inffast.h \ $(ZLIB_TREE)/inffixed.h \ @@ -59,20 +61,6 @@ nodist_libz_a_SOURCES = \ $(ZLIB_TREE)/zutil.h \ $(ZLIB_TREE)/zutil.c -if ZLIB123 -nodist_libz_a_SOURCES += \ - $(ZLIB_TREE)/gzio.c -ZCONF_SRC = zconf.in.h -else -nodist_libz_a_SOURCES += \ - $(ZLIB_TREE)/gzclose.c \ - $(ZLIB_TREE)/gzguts.h \ - $(ZLIB_TREE)/gzlib.c \ - $(ZLIB_TREE)/gzread.c \ - $(ZLIB_TREE)/gzwrite.c -ZCONF_SRC = zconf.h.in -endif - $(libz_a_OBJECTS): zconf.h if build @@ -86,7 +74,7 @@ LDADD = libz.a nodist_example_SOURCES = $(ZLIB_TREE)/example.c nodist_minigzip_SOURCES = $(ZLIB_TREE)/minigzip.c -zconf.h: $(ZLIB_TREE)/$(ZCONF_SRC) config.status +zconf.h: $(ZLIB_TREE)/zconf.h.in config.status echo '$(SHELL) ./config.status $@' $(SHELL) ./config.status $@ |