zlib: Fix build

Update #3254.
This commit is contained in:
Sebastian Huber
2017-12-13 09:32:11 +01:00
parent 241fc046a7
commit d19e7aab4b
4 changed files with 7 additions and 6 deletions
+1
View File
@@ -37,6 +37,7 @@ CLEANFILES = preinstall-stamp
include_HEADERS =
include_HEADERS += include/endian.h
include_HEADERS += include/zconf.h
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS =
+4
View File
@@ -22,6 +22,10 @@ $(PROJECT_INCLUDE)/endian.h: include/endian.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/endian.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/endian.h
$(PROJECT_INCLUDE)/zconf.h: include/zconf.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zconf.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/zconf.h
$(PROJECT_INCLUDE)/rtems/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+1 -1
View File
@@ -18,7 +18,7 @@ libz_a_SOURCES += zconf.h
libz_a_SOURCES += zlib.h
libz_a_SOURCES += zutil.c zutil.h
include_HEADERS = zlib.h zconf.h
include_HEADERS = zlib.h
include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+1 -5
View File
@@ -11,7 +11,7 @@ DISTCLEANFILES = $(PREINSTALL_DIRS)
all-am: $(PREINSTALL_FILES)
PREINSTALL_FILES =
CLEANFILES += $(PREINSTALL_FILES)
CLEANFILES = $(PREINSTALL_FILES)
all-local: $(TMPINSTALL_FILES)
@@ -36,7 +36,3 @@ $(PROJECT_INCLUDE)/zlib.h: zlib.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zlib.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/zlib.h
$(PROJECT_INCLUDE)/zconf.h: zconf.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zconf.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/zconf.h