Browse code

bb11062 - require internal libmspack for make distcheck

Mickey Sola authored on 2016/10/22 06:05:45
Showing 4 changed files
... ...
@@ -21,7 +21,7 @@ AM_YFLAGS = -d
21 21
 AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis $(LTDLINCL)
22 22
 AM_CFLAGS=@WERR_CFLAGS@
23 23
 lib_LTLIBRARIES =
24
-EXTRA_DIST = c++/Makefile.nollvm.in
24
+EXTRA_DIST = c++/Makefile.nollvm.in libmspack-0.5alpha/Makefile.intmspack.in
25 25
 if ENABLE_UNRAR
26 26
 
27 27
 AM_CPPFLAGS += -DWARN_DLOPEN_FAIL
... ...
@@ -183,6 +183,9 @@ libclamav_la_LIBADD +=  @top_builddir@/libclamav/libmspack-0.5alpha/.libs/cabc.o
183 183
 else
184 184
 libclamav_la_CFLAGS += $(LIBMSPACK_CFLAGS)
185 185
 libclamav_la_LDFLAGS += $(LIBMSPACK_LIBS)
186
+libmspack-0.5alpha/Makefile: libmspack-0.5alpha/Makefile.intmspack.in
187
+	$(AM_V_at) cp $< $@
188
+distclean-recursive distdir maintainer-clean-recursive: libmspack-0.5alpha/Makefile
186 189
 endif
187 190
 
188 191
 include_HEADERS = clamav.h
... ...
@@ -960,8 +960,9 @@ AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis $(LTDLINCL) \
960 960
 	$(am__append_1)
961 961
 AM_CFLAGS = @WERR_CFLAGS@
962 962
 lib_LTLIBRARIES = $(am__append_3) libclamav.la
963
-EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) regex/engine.c \
964
-	tomsfastmath/sqr/fp_sqr_comba.c \
963
+EXTRA_DIST = c++/Makefile.nollvm.in \
964
+	libmspack-0.5alpha/Makefile.intmspack.in $(am__append_4) \
965
+	regex/engine.c tomsfastmath/sqr/fp_sqr_comba.c \
965 966
 	tomsfastmath/mul/fp_mul_comba.c libclamav.map \
966 967
 	jsparse/generated/operators.h jsparse/generated/keywords.h \
967 968
 	jsparse/future_reserved_words.list jsparse/keywords.list \
... ...
@@ -3782,6 +3783,9 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
3782 3782
 @ENABLE_LLVM_FALSE@c++/Makefile: c++/Makefile.nollvm.in
3783 3783
 @ENABLE_LLVM_FALSE@	$(AM_V_at) cp $< $@
3784 3784
 @ENABLE_LLVM_FALSE@distclean-recursive distdir maintainer-clean-recursive: c++/Makefile
3785
+@USE_INTERNAL_MSPACK_FALSE@libmspack-0.5alpha/Makefile: libmspack-0.5alpha/Makefile.intmspack.in
3786
+@USE_INTERNAL_MSPACK_FALSE@	$(AM_V_at) cp $< $@
3787
+@USE_INTERNAL_MSPACK_FALSE@distclean-recursive distdir maintainer-clean-recursive: libmspack-0.5alpha/Makefile
3785 3788
 
3786 3789
 .PHONY: version.h.tmp
3787 3790
 version.c: version.h
... ...
@@ -5755,8 +5755,8 @@ maintainer-clean-generic:
5755 5755
 	@echo "This command is intended for maintainers to use"
5756 5756
 	@echo "it deletes files that may require special tools to rebuild."
5757 5757
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
5758
-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5759 5758
 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5759
+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5760 5760
 clean: clean-am
5761 5761
 
5762 5762
 clean-am: clean-generic clean-libtool clean-local \
5763 5763
new file mode 100644
... ...
@@ -0,0 +1,9 @@
0
+.PHONY: distdir distclean maintainer-clean
1
+distdir:
2
+	echo "make distdir requires internal libmspack"
3
+	exit 1
4
+
5
+# nothing to do here, rules must exist for distclean to succeed
6
+distclean:
7
+	-rm -f Makefile
8
+maintainer-clean: