Fix 'make dist'

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4173 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/Makefile.am b/Makefile.am
index b7de812caea3fbf8aee0d0aa07cbf23c64ea6054..00c2fcc1da5abd18ced92517df4e0d1944ce6491 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,8 @@ endif
 dmg: all
        sh $(srcdir)/release/makemacpkg ${PACKAGE_NAME} ${VERSION} ${BUILD} ${srcdir}
 
-EXTRA_DIST = CMakeLists.txt cmakescripts/getdate.bat
+EXTRA_DIST = CMakeLists.txt cmakescripts/getdate.bat LICENCE.TXT \
+       doc java media release
+
+dist-hook:
+       rm -rf `find $(distdir) -name .svn`

diff --git a/common/jpeg/Makefile.am b/common/jpeg/Makefile.am
index cd1c2212ffd15b6a39f0945f277cc7c8ca201997..3e43874e797a4e1a123d75e1d6297859840d0273 100644 (file)
--- a/common/jpeg/Makefile.am
+++ b/common/jpeg/Makefile.am
@@ -1,5 +1,6 @@
 noinst_LTLIBRARIES = libjpeg.la
-noinst_HEADERS = jconfig.h jerror.h jmorecfg.h jpeglib.h
+noinst_HEADERS = jerror.h jmorecfg.h jpeglib.h
+nodist_noinst_HEADERS = jconfig.h
 
 HDRS = jchuff.h jdct.h jdhuff.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
        jpegint.h jpeglib.h jversion.h jsimd.h jsimddct.h
@@ -57,7 +58,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c cdjpeg.c transupp.c transupp.h
 jpegtran_LDADD = libjpeg.la
 
 
-DOCS= README README-turbo.txt LICENSE.txt LGPL.txt
+DOCS= jconfig.doc README README-turbo.txt LICENSE.txt LGPL.txt \
+       README_TigerVNC.txt
 
 TESTFILES= testorig.jpg testorig.ppm testimg.bmp testimgflt.jpg \
        testimgfst.jpg testimgint.jpg testimgp.jpg testimgflt.ppm testimgfst.ppm \

diff --git a/common/zlib/Makefile.am b/common/zlib/Makefile.am
index 743ac5c02c388e5c0ff50c771f887795bae72938..07a017408bc0097dae4d393e76d66ba0c927f768 100644 (file)
--- a/common/zlib/Makefile.am
+++ b/common/zlib/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libz.la
 
-HDRS = deflate.h infblock.h infcodes.h inffast.h inffixed.h inftrees.h \
-       infutil.h trees.h zconf.h zlib.h zutil.h
+HDRS = crc32.h deflate.h gzguts.h inffast.h inffixed.h inflate.h inftrees.h \
+       trees.h zconf.h zlib.h zutil.h
 
 libz_la_SOURCES = $(HDRS) adler32.c compress.c crc32.c deflate.c gzclose.c \
        gzlib.c gzread.c gzwrite.c inflate.c infback.c inftrees.c inffast.c \

diff --git a/po/LINGUAS b/po/LINGUAS
index 7de7351f1d215c67ab2e37bcd3d16bd1f317b4be..1363ff3bb90875d5af0550cc2719779b5989d442 100644 (file)
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-de fr pl sk sv
+de fr pl ru sk sv

diff --git a/unix/Makefile.am b/unix/Makefile.am
index f45808edf64c536a19be5518691c62c574de2011..d447883195fb2ead5590d7900433a28cbbcb055f 100644 (file)
--- a/unix/Makefile.am
+++ b/unix/Makefile.am
@@ -6,10 +6,9 @@ man1_MANS = vncserver.man
 
 XVNCDIR = xserver/hw/vnc
 
-EXTRA_DIST = vncserver.man $(XVNCDIR)/RegionHelper.h $(XVNCDIR)/vncExtInit.cc \
-       $(XVNCDIR)/buildtime.c $(XVNCDIR)/XserverDesktop.h $(XVNCDIR)/xvnc.cc \
-       $(XVNCDIR)/Xvnc.man $(XVNCDIR)/Input.cc $(XVNCDIR)/xf86vncModule.cc \
-       $(XVNCDIR)/XserverDesktop.cc $(XVNCDIR)/Input.h \
-       $(XVNCDIR)/xorg-version.h $(XVNCDIR)/vncHooks.h \
-       $(XVNCDIR)/Makefile.am $(XVNCDIR)/vncHooks.cc $(XVNCDIR)/vncExtInit.h \
-       xserver15.patch xserver16.patch xserver17.patch xserver18.patch
+EXTRA_DIST = vncserver.man $(XVNCDIR) xserver15.patch xserver16.patch \
+       xserver17.patch xserver18.patch xserver19.patch build-xorg build-xorg-git \
+       download-xorg-7.4 download-xorg-7.5 xorg-7.5-patches
+
+dist-hook:
+       rm -rf `find $(distdir) -name .svn`

diff --git a/win/Makefile.am b/win/Makefile.am
index 372b699107c477a282ed6a98cc267f2d879dbe0e..070581a0643baf3e489de91b6fb1bded71a0a025 100644 (file)
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -4,4 +4,8 @@ if BUILD_WINVNC
 SUBDIRS += vncconfig winvnc
 endif
 
-EXTRA_DIST = logmessages/messages.h CMakeLists.txt
+EXTRA_DIST = logmessages LICENCE.TXT README.txt README_BINARY.txt \
+       resdefs.h.in tigervnc.iss.in wm_hooks CMakeLists.txt
+
+dist-hook:
+       rm -rf `find $(distdir) -name .svn`

diff --git a/win/vncconfig/Makefile.am b/win/vncconfig/Makefile.am
index b22b28c1c043a035bdd4b8cb28ec092de11a032b..4165aee9f8105d5520b71ff7820050d47a91a928 100644 (file)
--- a/win/vncconfig/Makefile.am
+++ b/win/vncconfig/Makefile.am
@@ -14,7 +14,8 @@ vncconfig_LDADD = $(top_builddir)/win/rfb_win32/librfb_win32.la \
        $(top_builddir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \\r
        -lcomctl32 resources.o\r
 \r
-EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest CMakeLists.txt\r
+EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest \
+       vncconfig.exe.manifest64 CMakeLists.txt\r
 \r
 resources.o: vncconfig.rc\r
        $(WINDRES) $^ -o $@\r

diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am
index 1a4862547114525cdd4132e2394e4f13ab9be72f..d19634ec8462e7f6124cfd310326da2d23c03e2a 100644 (file)
--- a/win/vncviewer/Makefile.am
+++ b/win/vncviewer/Makefile.am
@@ -42,7 +42,7 @@ vncviewer_LDADD = $(top_builddir)/common/rfb/librfb.la \
 vncviewer_LDFLAGS = -I$(top_srcdir)/win -mwindows
 
 EXTRA_DIST = vncviewer.rc vncviewer.ico cursor1.cur vncviewer.exe.manifest \
-       vncviewer.bmp toolbar.bmp CMakeLists.txt
+       vncviewer.exe.manifest64 vncviewer.bmp toolbar.bmp CMakeLists.txt
 
 resources.o: vncviewer.rc
        $(WINDRES) $^ -o $@

diff --git a/win/winvnc/Makefile.am b/win/winvnc/Makefile.am
index 0ede9218cb9c683778c9ad92462fa4a1c319cfd2..986e017ebdad286f449d50fef7d8fafae146439e 100644 (file)
--- a/win/winvnc/Makefile.am
+++ b/win/winvnc/Makefile.am
@@ -20,8 +20,8 @@ winvnc4_LDADD = $(top_builddir)/common/rfb/librfb.la \
 winvnc4_LDFLAGS = -mwindows\r
 \r
 EXTRA_DIST = winvnc.rc winvnc.ico connected.ico icon_dis.ico connecte.ico \\r
-       winvnc4.exe.manifest winvnc.bmp CMakeLists.txt\r
+       winvnc4.exe.manifest winvnc4.exe.manifest64 winvnc.bmp index.vnc \
+       CMakeLists.txt\r
 \r
 resources.o: winvnc.rc\r
        $(WINDRES) $^ -o $@\r
-\r