From 8c1cc6b5dc9615ead9d97562976b3d22a5b9d00e Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 16 Jul 2012 15:45:30 -0700 Subject: [PATCH] makefile.unix dist: explicitly name installed includes avoids mux.h, format_constants.h Change-Id: I6c8458dd1ce7faa23fbf1e3df84a8dfc4a884a3e --- makefile.unix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/makefile.unix b/makefile.unix index 777983b1..a33753d9 100644 --- a/makefile.unix +++ b/makefile.unix @@ -134,6 +134,11 @@ UTILS_OBJS = \ LIBWEBP_OBJS = $(DEC_OBJS) $(DSP_OBJS) $(ENC_OBJS) $(UTILS_OBJS) LIBWEBPMUX_OBJS = $(MUX_OBJS) +HDRS_INSTALLED = \ + src/webp/decode.h \ + src/webp/encode.h \ + src/webp/types.h \ + HDRS = \ src/dec/vp8i.h \ src/dec/vp8li.h \ @@ -152,12 +157,10 @@ HDRS = \ src/utils/quant_levels.h \ src/utils/rescaler.h \ src/utils/thread.h \ - src/webp/decode.h \ src/webp/decode_vp8.h \ - src/webp/encode.h \ src/webp/format_constants.h \ src/webp/mux.h \ - src/webp/types.h \ + $(HDRS_INSTALLED) \ OUT_LIBS = examples/libexample_util.a src/libwebp.a OUT_EXAMPLES = examples/cwebp examples/dwebp @@ -200,7 +203,7 @@ dist: all $(INSTALL) -m755 -d $(DESTDIR)/include/webp \ $(DESTDIR)/doc $(DESTDIR)/lib $(INSTALL) -m755 -s $(OUT_EXAMPLES) $(DESTDIR) - $(INSTALL) -m644 src/webp/*.h $(DESTDIR)/include/webp + $(INSTALL) -m644 $(HDRS_INSTALLED) $(DESTDIR)/include/webp $(INSTALL) -m644 src/libwebp.a $(DESTDIR)/lib umask 022; \ for m in man/[cd]webp.1; do \