Fix 'make dist'; Include LICENSE.md in packages

This commit is contained in:
DRC
2016-02-08 14:03:13 -06:00
parent 46ecffa324
commit 53c635b8e8
3 changed files with 7 additions and 5 deletions

View File

@@ -157,11 +157,11 @@ jcstest_LDADD = libjpeg.la
dist_man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.txt \
DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.md \
ChangeLog.txt
dist_doc_DATA = README.ijg README.md libjpeg.txt structure.txt usage.txt \
wizard.txt
wizard.txt LICENSE.md
exampledir = $(docdir)
dist_example_DATA = example.c
@@ -170,7 +170,7 @@ dist_example_DATA = example.c
EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \
doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \
jstdhuff.c jdcoefct.h jdmainct.h jdsample.h
jstdhuff.c jdcoefct.h jdmainct.h jdsample.h md5/CMakeLists.txt
dist-hook:
rm -rf `find $(distdir) -name .svn`

View File

@@ -81,6 +81,7 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)"
SetOutPath $INSTDIR\doc
File "@CMAKE_SOURCE_DIR@\README.ijg"
File "@CMAKE_SOURCE_DIR@\README.md"
File "@CMAKE_SOURCE_DIR@\LICENSE.md"
File "@CMAKE_SOURCE_DIR@\example.c"
File "@CMAKE_SOURCE_DIR@\libjpeg.txt"
File "@CMAKE_SOURCE_DIR@\structure.txt"
@@ -142,6 +143,7 @@ Section "Uninstall"
Delete $INSTDIR\uninstall_@VERSION@.exe
Delete $INSTDIR\doc\README.ijg
Delete $INSTDIR\doc\README.md
Delete $INSTDIR\doc\LICENSE.md
Delete $INSTDIR\doc\example.c
Delete $INSTDIR\doc\libjpeg.txt
Delete $INSTDIR\doc\structure.txt

View File

@@ -12,7 +12,7 @@ EXTRA_DIST = nasm_lt.sh CMakeLists.txt \
if SIMD_X86_64
libsimd_la_SOURCES = jsimd_x86_64.c jsimd.h jsimdcfg.inc.h jsimdext.inc \
jcolsamp.inc jdct.inc jfdctflt-sse-64.asm \
jcolsamp.inc jdct.inc jpeg_nbits_table.inc jfdctflt-sse-64.asm \
jccolor-sse2-64.asm jcgray-sse2-64.asm jchuff-sse2-64.asm \
jcsample-sse2-64.asm jdcolor-sse2-64.asm jdmerge-sse2-64.asm \
jdsample-sse2-64.asm jfdctfst-sse2-64.asm jfdctint-sse2-64.asm \
@@ -29,7 +29,7 @@ endif
if SIMD_I386
libsimd_la_SOURCES = jsimd_i386.c jsimd.h jsimdcfg.inc.h jsimdext.inc \
jcolsamp.inc jdct.inc jsimdcpu.asm \
jcolsamp.inc jdct.inc jpeg_nbits_table.inc jsimdcpu.asm \
jfdctflt-3dn.asm jidctflt-3dn.asm jquant-3dn.asm \
jccolor-mmx.asm jcgray-mmx.asm jcsample-mmx.asm \
jdcolor-mmx.asm jdmerge-mmx.asm jdsample-mmx.asm \