From 80dfacff66d88fd0f43503cb0897f31231a007ca Mon Sep 17 00:00:00 2001 From: DRC Date: Wed, 27 Oct 2010 08:01:09 +0000 Subject: [PATCH] Unix LF git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4174 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- win/vncconfig/Makefile.am | 40 +++++++++++++++--------------- win/winvnc/Makefile.am | 52 +++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/win/vncconfig/Makefile.am b/win/vncconfig/Makefile.am index 4165aee9..a392386c 100644 --- a/win/vncconfig/Makefile.am +++ b/win/vncconfig/Makefile.am @@ -1,21 +1,21 @@ -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 - +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 - -resources.o: vncconfig.rc - $(WINDRES) $^ -o $@ + vncconfig.exe.manifest64 CMakeLists.txt + +resources.o: vncconfig.rc + $(WINDRES) $^ -o $@ diff --git a/win/winvnc/Makefile.am b/win/winvnc/Makefile.am index 986e017e..dabfde29 100644 --- a/win/winvnc/Makefile.am +++ b/win/winvnc/Makefile.am @@ -1,27 +1,27 @@ -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 \ +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 - -resources.o: winvnc.rc - $(WINDRES) $^ -o $@ + CMakeLists.txt + +resources.o: winvnc.rc + $(WINDRES) $^ -o $@ -- 2.39.5