Unix LF

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

diff --git a/win/vncconfig/Makefile.am b/win/vncconfig/Makefile.am
index 4165aee9f8105d5520b71ff7820050d47a91a928..a392386cb121585023fdf621bb5cc043134b7a24 100644 (file)
--- a/win/vncconfig/Makefile.am
+++ b/win/vncconfig/Makefile.am
@@ -1,21 +1,21 @@
-bin_PROGRAMS = vncconfig\r
-\r
-HDRS = Authentication.h Connections.h Desktop.h Hooking.h Inputs.h Legacy.h \\r
-       PasswordDialog.h resource.h Sharing.h\r
-\r
-vncconfig_SOURCES = $(HDRS) Legacy.cxx PasswordDialog.cxx vncconfig.cxx\r
-\r
-vncconfig_CPPFLAGS = -I$(top_srcdir)/win -I$(top_srcdir)/common\r
-\r
-vncconfig_LDADD = $(top_builddir)/win/rfb_win32/librfb_win32.la \\r
-       $(top_builddir)/common/rfb/librfb.la \\r
-       $(top_builddir)/common/Xregion/libXregion.la \\r
-       $(top_builddir)/common/network/libnetwork.la \\r
-       $(top_builddir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \\r
-       -lcomctl32 resources.o\r
-\r
+bin_PROGRAMS = vncconfig
+
+HDRS = Authentication.h Connections.h Desktop.h Hooking.h Inputs.h Legacy.h \
+       PasswordDialog.h resource.h Sharing.h
+
+vncconfig_SOURCES = $(HDRS) Legacy.cxx PasswordDialog.cxx vncconfig.cxx
+
+vncconfig_CPPFLAGS = -I$(top_srcdir)/win -I$(top_srcdir)/common
+
+vncconfig_LDADD = $(top_builddir)/win/rfb_win32/librfb_win32.la \
+       $(top_builddir)/common/rfb/librfb.la \
+       $(top_builddir)/common/Xregion/libXregion.la \
+       $(top_builddir)/common/network/libnetwork.la \
+       $(top_builddir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \
+       -lcomctl32 resources.o
+
 EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest \
-       vncconfig.exe.manifest64 CMakeLists.txt\r
-\r
-resources.o: vncconfig.rc\r
-       $(WINDRES) $^ -o $@\r
+       vncconfig.exe.manifest64 CMakeLists.txt
+
+resources.o: vncconfig.rc
+       $(WINDRES) $^ -o $@

diff --git a/win/winvnc/Makefile.am b/win/winvnc/Makefile.am
index 986e017ebdad286f449d50fef7d8fafae146439e..dabfde2919d125ed91e8793c576d6bf8f49e6d17 100644 (file)
--- a/win/winvnc/Makefile.am
+++ b/win/winvnc/Makefile.am
@@ -1,27 +1,27 @@
-bin_PROGRAMS = winvnc4\r
-\r
-HDRS = AddNewClientDialog.h ControlPanel.h JavaViewer.h ManagedListener.h \\r
-       QueryConnectDialog.h STrayIcon.h VNCServerService.h VNCServerWin32.h \\r
-       resource.h\r
-\r
-winvnc4_SOURCES = $(HDRS) buildTime.cxx ControlPanel.cxx JavaViewer.cxx \\r
-       ManagedListener.cxx QueryConnectDialog.cxx STrayIcon.cxx \\r
-       VNCServerService.cxx VNCServerWin32.cxx winvnc.cxx\r
-\r
-winvnc4_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win\r
-\r
-winvnc4_LDADD = $(top_builddir)/common/rfb/librfb.la \\r
-       $(top_builddir)/win/rfb_win32/librfb_win32.la \\r
-       $(top_builddir)/common/Xregion/libXregion.la \\r
-       $(top_builddir)/common/network/libnetwork.la \\r
-       $(top_builddir)/common/rdr/librdr.la resources.o -lws2_32 -lgdi32 \\r
-       -lole32 -lcomctl32 -lversion\r
-\r
-winvnc4_LDFLAGS = -mwindows\r
-\r
-EXTRA_DIST = winvnc.rc winvnc.ico connected.ico icon_dis.ico connecte.ico \\r
+bin_PROGRAMS = winvnc4
+
+HDRS = AddNewClientDialog.h ControlPanel.h JavaViewer.h ManagedListener.h \
+       QueryConnectDialog.h STrayIcon.h VNCServerService.h VNCServerWin32.h \
+       resource.h
+
+winvnc4_SOURCES = $(HDRS) buildTime.cxx ControlPanel.cxx JavaViewer.cxx \
+       ManagedListener.cxx QueryConnectDialog.cxx STrayIcon.cxx \
+       VNCServerService.cxx VNCServerWin32.cxx winvnc.cxx
+
+winvnc4_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
+
+winvnc4_LDADD = $(top_builddir)/common/rfb/librfb.la \
+       $(top_builddir)/win/rfb_win32/librfb_win32.la \
+       $(top_builddir)/common/Xregion/libXregion.la \
+       $(top_builddir)/common/network/libnetwork.la \
+       $(top_builddir)/common/rdr/librdr.la resources.o -lws2_32 -lgdi32 \
+       -lole32 -lcomctl32 -lversion
+
+winvnc4_LDFLAGS = -mwindows
+
+EXTRA_DIST = winvnc.rc winvnc.ico connected.ico icon_dis.ico connecte.ico \
        winvnc4.exe.manifest winvnc4.exe.manifest64 winvnc.bmp index.vnc \
-       CMakeLists.txt\r
-\r
-resources.o: winvnc.rc\r
-       $(WINDRES) $^ -o $@\r
+       CMakeLists.txt
+
+resources.o: winvnc.rc
+       $(WINDRES) $^ -o $@