diff --git a/Makefile.am b/Makefile.am index edf9fec8..d3e210ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = . -VDEPTH = ./$(VPATH) SUBDIRS = \ lib \ diff --git a/cmd/Makefile.am b/cmd/Makefile.am index 3d028996..2472175e 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. -VDEPTH = ./$(VPATH)/$(DEPTH) SUBDIRS = \ launcher \ diff --git a/cmd/launcher/Makefile.am b/cmd/launcher/Makefile.am index 782d771a..deb8c719 100644 --- a/cmd/launcher/Makefile.am +++ b/cmd/launcher/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ CAdvancedOptions.cpp \ diff --git a/cmd/synergyc/Makefile.am b/cmd/synergyc/Makefile.am index 4f53508b..950a0072 100644 --- a/cmd/synergyc/Makefile.am +++ b/cmd/synergyc/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ CMSWindowsClientTaskBarReceiver.cpp \ @@ -40,31 +38,31 @@ synergyc_SOURCES = \ CXWindowsClientTaskBarReceiver.h \ synergyc.cpp \ $(NULL) -synergyc_LDADD = \ - $(DEPTH)/lib/client/libclient.a \ - $(DEPTH)/lib/platform/libplatform.a \ - $(DEPTH)/lib/synergy/libsynergy.a \ - $(DEPTH)/lib/net/libnet.a \ - $(DEPTH)/lib/io/libio.a \ - $(DEPTH)/lib/mt/libmt.a \ - $(DEPTH)/lib/base/libbase.a \ - $(DEPTH)/lib/common/libcommon.a \ - $(DEPTH)/lib/arch/libarch.a \ - $(X_LIBS) \ - $(X_PRE_LIBS) \ - -lXtst \ - -lXext \ - -lX11 \ - $(X_EXTRA_LIBS) \ +synergyc_LDADD = \ + $(top_builddir)/lib/client/libclient.a \ + $(top_builddir)/lib/platform/libplatform.a \ + $(top_builddir)/lib/synergy/libsynergy.a \ + $(top_builddir)/lib/net/libnet.a \ + $(top_builddir)/lib/io/libio.a \ + $(top_builddir)/lib/mt/libmt.a \ + $(top_builddir)/lib/base/libbase.a \ + $(top_builddir)/lib/common/libcommon.a \ + $(top_builddir)/lib/arch/libarch.a \ + $(X_LIBS) \ + $(X_PRE_LIBS) \ + -lXtst \ + -lXext \ + -lX11 \ + $(X_EXTRA_LIBS) \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ - -I$(VDEPTH)/lib/mt \ - -I$(VDEPTH)/lib/io \ - -I$(VDEPTH)/lib/net \ - -I$(VDEPTH)/lib/synergy \ - -I$(VDEPTH)/lib/platform \ - -I$(VDEPTH)/lib/client \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ + -I$(top_srcdir)/lib/mt \ + -I$(top_srcdir)/lib/io \ + -I$(top_srcdir)/lib/net \ + -I$(top_srcdir)/lib/synergy \ + -I$(top_srcdir)/lib/platform \ + -I$(top_srcdir)/lib/client \ $(NULL) diff --git a/cmd/synergys/Makefile.am b/cmd/synergys/Makefile.am index 5ef69af9..1a45c95f 100644 --- a/cmd/synergys/Makefile.am +++ b/cmd/synergys/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ CMSWindowsServerTaskBarReceiver.cpp \ @@ -40,31 +38,31 @@ synergys_SOURCES = \ CXWindowsServerTaskBarReceiver.h \ synergys.cpp \ $(NULL) -synergys_LDADD = \ - $(DEPTH)/lib/server/libserver.a \ - $(DEPTH)/lib/platform/libplatform.a \ - $(DEPTH)/lib/synergy/libsynergy.a \ - $(DEPTH)/lib/net/libnet.a \ - $(DEPTH)/lib/io/libio.a \ - $(DEPTH)/lib/mt/libmt.a \ - $(DEPTH)/lib/base/libbase.a \ - $(DEPTH)/lib/common/libcommon.a \ - $(DEPTH)/lib/arch/libarch.a \ - $(X_LIBS) \ - $(X_PRE_LIBS) \ - -lXtst \ - -lXext \ - -lX11 \ - $(X_EXTRA_LIBS) \ +synergys_LDADD = \ + $(top_builddir)/lib/server/libserver.a \ + $(top_builddir)/lib/platform/libplatform.a \ + $(top_builddir)/lib/synergy/libsynergy.a \ + $(top_builddir)/lib/net/libnet.a \ + $(top_builddir)/lib/io/libio.a \ + $(top_builddir)/lib/mt/libmt.a \ + $(top_builddir)/lib/base/libbase.a \ + $(top_builddir)/lib/common/libcommon.a \ + $(top_builddir)/lib/arch/libarch.a \ + $(X_LIBS) \ + $(X_PRE_LIBS) \ + -lXtst \ + -lXext \ + -lX11 \ + $(X_EXTRA_LIBS) \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ - -I$(VDEPTH)/lib/mt \ - -I$(VDEPTH)/lib/io \ - -I$(VDEPTH)/lib/net \ - -I$(VDEPTH)/lib/synergy \ - -I$(VDEPTH)/lib/platform \ - -I$(VDEPTH)/lib/server \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ + -I$(top_srcdir)/lib/mt \ + -I$(top_srcdir)/lib/io \ + -I$(top_srcdir)/lib/net \ + -I$(top_srcdir)/lib/synergy \ + -I$(top_srcdir)/lib/platform \ + -I$(top_srcdir)/lib/server \ $(NULL) diff --git a/dist/Makefile.am b/dist/Makefile.am index b23a284e..1af99c18 100644 --- a/dist/Makefile.am +++ b/dist/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. -VDEPTH = ./$(VPATH)/$(DEPTH) SUBDIRS = \ rpm \ diff --git a/dist/nullsoft/Makefile.am b/dist/nullsoft/Makefile.am index b45cc611..5630da82 100644 --- a/dist/nullsoft/Makefile.am +++ b/dist/nullsoft/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ installer.dsp \ diff --git a/dist/rpm/Makefile.am b/dist/rpm/Makefile.am index e19d9eec..0e86d9ba 100644 --- a/dist/rpm/Makefile.am +++ b/dist/rpm/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ synergy.spec.in \ diff --git a/lib/Makefile.am b/lib/Makefile.am index b0701a61..2a57133c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = .. -VDEPTH = ./$(VPATH)/$(DEPTH) SUBDIRS = \ common \ diff --git a/lib/arch/Makefile.am b/lib/arch/Makefile.am index 2b32473c..47888ade 100644 --- a/lib/arch/Makefile.am +++ b/lib/arch/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ arch.dsp \ @@ -97,5 +95,5 @@ EXTRA_libarch_a_SOURCES = \ XArchUnix.h \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ + -I$(top_srcdir)/lib/common \ $(NULL) diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am index 6ac0f716..87f48162 100644 --- a/lib/base/Makefile.am +++ b/lib/base/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ base.dsp \ @@ -59,6 +57,6 @@ libbase_a_SOURCES = \ XBase.h \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ $(NULL) diff --git a/lib/client/Makefile.am b/lib/client/Makefile.am index 9d6ba463..67b2b80e 100644 --- a/lib/client/Makefile.am +++ b/lib/client/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ client.dsp \ @@ -31,12 +29,12 @@ libclient_a_SOURCES = \ CServerProxy.h \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ - -I$(VDEPTH)/lib/mt \ - -I$(VDEPTH)/lib/io \ - -I$(VDEPTH)/lib/net \ - -I$(VDEPTH)/lib/synergy \ - -I$(VDEPTH)/lib/platform \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ + -I$(top_srcdir)/lib/mt \ + -I$(top_srcdir)/lib/io \ + -I$(top_srcdir)/lib/net \ + -I$(top_srcdir)/lib/synergy \ + -I$(top_srcdir)/lib/platform \ $(NULL) diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am index 34aaec8f..092fef3e 100644 --- a/lib/common/Makefile.am +++ b/lib/common/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ common.dsp \ diff --git a/lib/io/Makefile.am b/lib/io/Makefile.am index ad4f67fa..d7388187 100644 --- a/lib/io/Makefile.am +++ b/lib/io/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ io.dsp \ @@ -36,8 +34,8 @@ libio_a_SOURCES = \ XIO.h \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ - -I$(VDEPTH)/lib/mt \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ + -I$(top_srcdir)/lib/mt \ $(NULL) diff --git a/lib/mt/Makefile.am b/lib/mt/Makefile.am index 1d0dc5ff..553cf6a3 100644 --- a/lib/mt/Makefile.am +++ b/lib/mt/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ mt.dsp \ @@ -37,8 +35,8 @@ libmt_a_SOURCES = \ XMT.h \ XThread.h \ $(NULL) -INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ +INCLUDES = \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ $(NULL) diff --git a/lib/net/Makefile.am b/lib/net/Makefile.am index fc8dfe4a..aab44c0d 100644 --- a/lib/net/Makefile.am +++ b/lib/net/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ net.dsp \ @@ -48,9 +46,9 @@ libnet_a_SOURCES = \ XSocket.h \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ - -I$(VDEPTH)/lib/mt \ - -I$(VDEPTH)/lib/io \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ + -I$(top_srcdir)/lib/mt \ + -I$(top_srcdir)/lib/io \ $(NULL) diff --git a/lib/platform/Makefile.am b/lib/platform/Makefile.am index 54e70b29..9ac9c323 100644 --- a/lib/platform/Makefile.am +++ b/lib/platform/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ makehook.dsp \ @@ -69,10 +67,10 @@ libplatform_a_SOURCES = \ CXWindowsUtil.h \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ - -I$(VDEPTH)/lib/mt \ - -I$(VDEPTH)/lib/io \ - -I$(VDEPTH)/lib/synergy \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ + -I$(top_srcdir)/lib/mt \ + -I$(top_srcdir)/lib/io \ + -I$(top_srcdir)/lib/synergy \ $(NULL) diff --git a/lib/server/Makefile.am b/lib/server/Makefile.am index 6dfd8a6f..7ffb76b4 100644 --- a/lib/server/Makefile.am +++ b/lib/server/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ server.dsp \ @@ -43,12 +41,12 @@ libserver_a_SOURCES = \ CServer.h \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ - -I$(VDEPTH)/lib/mt \ - -I$(VDEPTH)/lib/io \ - -I$(VDEPTH)/lib/net \ - -I$(VDEPTH)/lib/synergy \ - -I$(VDEPTH)/lib/platform \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ + -I$(top_srcdir)/lib/mt \ + -I$(top_srcdir)/lib/io \ + -I$(top_srcdir)/lib/net \ + -I$(top_srcdir)/lib/synergy \ + -I$(top_srcdir)/lib/platform \ $(NULL) diff --git a/lib/synergy/Makefile.am b/lib/synergy/Makefile.am index 27fe0c63..0265490c 100644 --- a/lib/synergy/Makefile.am +++ b/lib/synergy/Makefile.am @@ -12,8 +12,6 @@ ## Process this file with automake to produce Makefile.in NULL = -DEPTH = ../.. -VDEPTH = ./$(VPATH)/$(DEPTH) EXTRA_DIST = \ libsynergy.dsp \ @@ -60,10 +58,10 @@ libsynergy_a_SOURCES = \ XSynergy.h \ $(NULL) INCLUDES = \ - -I$(VDEPTH)/lib/common \ - -I$(VDEPTH)/lib/arch \ - -I$(VDEPTH)/lib/base \ - -I$(VDEPTH)/lib/mt \ - -I$(VDEPTH)/lib/io \ - -I$(VDEPTH)/lib/net \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/arch \ + -I$(top_srcdir)/lib/base \ + -I$(top_srcdir)/lib/mt \ + -I$(top_srcdir)/lib/io \ + -I$(top_srcdir)/lib/net \ $(NULL)