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 b7de812..00c2fcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,8 @@
 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 cd1c221..3e43874 100644
--- 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_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 743ac5c..07a0174 100644
--- 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 7de7351..1363ff3 100644
--- 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 f45808e..d447883 100644
--- a/unix/Makefile.am
+++ b/unix/Makefile.am
@@ -6,10 +6,9 @@
 
 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 372b699..070581a 100644
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -4,4 +4,8 @@
 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 b22b28c..4165aee 100644
--- a/win/vncconfig/Makefile.am
+++ b/win/vncconfig/Makefile.am
@@ -14,7 +14,8 @@
 	$(top_builddir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \

 	-lcomctl32 resources.o

 

-EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest CMakeLists.txt

+EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest \
+	vncconfig.exe.manifest64 CMakeLists.txt

 

 resources.o: vncconfig.rc

 	$(WINDRES) $^ -o $@

diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am
index 1a48625..d19634e 100644
--- a/win/vncviewer/Makefile.am
+++ b/win/vncviewer/Makefile.am
@@ -42,7 +42,7 @@
 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 0ede921..986e017 100644
--- a/win/winvnc/Makefile.am
+++ b/win/winvnc/Makefile.am
@@ -20,8 +20,8 @@
 winvnc4_LDFLAGS = -mwindows

 

 EXTRA_DIST = winvnc.rc winvnc.ico connected.ico icon_dis.ico connecte.ico \

-	winvnc4.exe.manifest winvnc.bmp CMakeLists.txt

+	winvnc4.exe.manifest winvnc4.exe.manifest64 winvnc.bmp index.vnc \
+	CMakeLists.txt

 

 resources.o: winvnc.rc

 	$(WINDRES) $^ -o $@

-