diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | common/jpeg/Makefile.am | 6 | ||||
| -rw-r--r-- | common/zlib/Makefile.am | 4 | ||||
| -rw-r--r-- | po/LINGUAS | 2 | ||||
| -rw-r--r-- | unix/Makefile.am | 13 | ||||
| -rw-r--r-- | win/Makefile.am | 6 | ||||
| -rw-r--r-- | win/vncconfig/Makefile.am | 3 | ||||
| -rw-r--r-- | win/vncviewer/Makefile.am | 2 | ||||
| -rw-r--r-- | win/winvnc/Makefile.am | 4 |
9 files changed, 28 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index b7de812c..00c2fcc1 100644 --- 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 cd1c2212..3e43874e 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_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 743ac5c0..07a01740 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 \ @@ -1 +1 @@ -de fr pl sk sv +de fr pl ru sk sv diff --git a/unix/Makefile.am b/unix/Makefile.am index f45808ed..d4478831 100644 --- 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 372b6991..070581a0 100644 --- 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 b22b28c1..4165aee9 100644 --- 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 \
-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 1a486254..d19634ec 100644 --- 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 0ede9218..986e017e 100644 --- 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
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 $@
-
|