Browse code

Removing final references to libmspack-0.5alpha, preventing make dist.

Micah Snyder authored on 2018/10/26 12:32:18
Showing 5 changed files
... ...
@@ -19,7 +19,7 @@
19 19
 ACLOCAL_AMFLAGS=-I m4
20 20
 
21 21
 SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
22
-EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 libclamav/libmspack-0.5alpha/mspack/mspack.def ChangeLog.md INSTALL.md NEWS.md README.md
22
+EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.md NEWS.md README.md
23 23
 
24 24
 bin_SCRIPTS=clamav-config
25 25
 
... ...
@@ -578,7 +578,7 @@ ACLOCAL_AMFLAGS = -I m4
578 578
 SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool \
579 579
 	clamconf database docs etc clamav-milter test clamdtop clambc \
580 580
 	unit_tests $(am__append_1) $(am__append_2)
581
-EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 libclamav/libmspack-0.5alpha/mspack/mspack.def ChangeLog.md INSTALL.md NEWS.md README.md
581
+EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.md NEWS.md README.md
582 582
 bin_SCRIPTS = clamav-config
583 583
 pkgconfigdir = $(libdir)/pkgconfig
584 584
 pkgconfig_DATA = libclamav.pc
... ...
@@ -239,7 +239,6 @@ MSPACK_CFLAGS = $(LIBMSPACK_CFLAGS)
239 239
 MSPACKLIBADD = $(LIBMSPACK_LIBS)
240 240
 MSPACKDEP =
241 241
 
242
-# EXTRA_DIST += libmspack-0.5alpha
243 242
 libmspack/Makefile: 
244 243
 .PHONY: distdir distclean maintainer-clean
245 244
 distdir:
... ...
@@ -4544,7 +4544,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
4544 4544
 @ENABLE_LLVM_FALSE@	$(AM_V_at) cp $< $@
4545 4545
 @ENABLE_LLVM_FALSE@distclean-recursive distdir maintainer-clean-recursive: c++/Makefile
4546 4546
 
4547
-# EXTRA_DIST += libmspack-0.5alpha
4548 4547
 @USE_INTERNAL_MSPACK_FALSE@libmspack/Makefile: 
4549 4548
 @USE_INTERNAL_MSPACK_FALSE@.PHONY: distdir distclean maintainer-clean
4550 4549
 @USE_INTERNAL_MSPACK_FALSE@distdir:
... ...
@@ -186,7 +186,7 @@
186 186
       <FunctionLevelLinking>true</FunctionLevelLinking>
187 187
       <IntrinsicFunctions>true</IntrinsicFunctions>
188 188
       <PreprocessorDefinitions>HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre2;$(SolutionDir)..;..\libclammspack\mspack;$(CLAM_DEPENDENCIES)\$(PlatformName)\include;..\libclamav\libmspack-0.5alpha\mspack</AdditionalIncludeDirectories>
189
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre2;$(SolutionDir)..;..\libclammspack\mspack;$(CLAM_DEPENDENCIES)\$(PlatformName)\include;</AdditionalIncludeDirectories>
190 190
       <CompileAs>CompileAsC</CompileAs>
191 191
       <DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings>
192 192
     </ClCompile>