Removed DEPTH, VDEPTH, and VPATH from makefiles.

This commit is contained in:
crs 2004-04-04 12:12:32 +00:00
parent ef908bf0bc
commit 083607345a
19 changed files with 94 additions and 132 deletions

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = .
VDEPTH = ./$(VPATH)
SUBDIRS = \ SUBDIRS = \
lib \ lib \

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ..
VDEPTH = ./$(VPATH)/$(DEPTH)
SUBDIRS = \ SUBDIRS = \
launcher \ launcher \

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
CAdvancedOptions.cpp \ CAdvancedOptions.cpp \

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
CMSWindowsClientTaskBarReceiver.cpp \ CMSWindowsClientTaskBarReceiver.cpp \
@ -41,15 +39,15 @@ synergyc_SOURCES = \
synergyc.cpp \ synergyc.cpp \
$(NULL) $(NULL)
synergyc_LDADD = \ synergyc_LDADD = \
$(DEPTH)/lib/client/libclient.a \ $(top_builddir)/lib/client/libclient.a \
$(DEPTH)/lib/platform/libplatform.a \ $(top_builddir)/lib/platform/libplatform.a \
$(DEPTH)/lib/synergy/libsynergy.a \ $(top_builddir)/lib/synergy/libsynergy.a \
$(DEPTH)/lib/net/libnet.a \ $(top_builddir)/lib/net/libnet.a \
$(DEPTH)/lib/io/libio.a \ $(top_builddir)/lib/io/libio.a \
$(DEPTH)/lib/mt/libmt.a \ $(top_builddir)/lib/mt/libmt.a \
$(DEPTH)/lib/base/libbase.a \ $(top_builddir)/lib/base/libbase.a \
$(DEPTH)/lib/common/libcommon.a \ $(top_builddir)/lib/common/libcommon.a \
$(DEPTH)/lib/arch/libarch.a \ $(top_builddir)/lib/arch/libarch.a \
$(X_LIBS) \ $(X_LIBS) \
$(X_PRE_LIBS) \ $(X_PRE_LIBS) \
-lXtst \ -lXtst \
@ -58,13 +56,13 @@ synergyc_LDADD = \
$(X_EXTRA_LIBS) \ $(X_EXTRA_LIBS) \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
-I$(VDEPTH)/lib/mt \ -I$(top_srcdir)/lib/mt \
-I$(VDEPTH)/lib/io \ -I$(top_srcdir)/lib/io \
-I$(VDEPTH)/lib/net \ -I$(top_srcdir)/lib/net \
-I$(VDEPTH)/lib/synergy \ -I$(top_srcdir)/lib/synergy \
-I$(VDEPTH)/lib/platform \ -I$(top_srcdir)/lib/platform \
-I$(VDEPTH)/lib/client \ -I$(top_srcdir)/lib/client \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
CMSWindowsServerTaskBarReceiver.cpp \ CMSWindowsServerTaskBarReceiver.cpp \
@ -41,15 +39,15 @@ synergys_SOURCES = \
synergys.cpp \ synergys.cpp \
$(NULL) $(NULL)
synergys_LDADD = \ synergys_LDADD = \
$(DEPTH)/lib/server/libserver.a \ $(top_builddir)/lib/server/libserver.a \
$(DEPTH)/lib/platform/libplatform.a \ $(top_builddir)/lib/platform/libplatform.a \
$(DEPTH)/lib/synergy/libsynergy.a \ $(top_builddir)/lib/synergy/libsynergy.a \
$(DEPTH)/lib/net/libnet.a \ $(top_builddir)/lib/net/libnet.a \
$(DEPTH)/lib/io/libio.a \ $(top_builddir)/lib/io/libio.a \
$(DEPTH)/lib/mt/libmt.a \ $(top_builddir)/lib/mt/libmt.a \
$(DEPTH)/lib/base/libbase.a \ $(top_builddir)/lib/base/libbase.a \
$(DEPTH)/lib/common/libcommon.a \ $(top_builddir)/lib/common/libcommon.a \
$(DEPTH)/lib/arch/libarch.a \ $(top_builddir)/lib/arch/libarch.a \
$(X_LIBS) \ $(X_LIBS) \
$(X_PRE_LIBS) \ $(X_PRE_LIBS) \
-lXtst \ -lXtst \
@ -58,13 +56,13 @@ synergys_LDADD = \
$(X_EXTRA_LIBS) \ $(X_EXTRA_LIBS) \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
-I$(VDEPTH)/lib/mt \ -I$(top_srcdir)/lib/mt \
-I$(VDEPTH)/lib/io \ -I$(top_srcdir)/lib/io \
-I$(VDEPTH)/lib/net \ -I$(top_srcdir)/lib/net \
-I$(VDEPTH)/lib/synergy \ -I$(top_srcdir)/lib/synergy \
-I$(VDEPTH)/lib/platform \ -I$(top_srcdir)/lib/platform \
-I$(VDEPTH)/lib/server \ -I$(top_srcdir)/lib/server \
$(NULL) $(NULL)

2
dist/Makefile.am vendored
View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ..
VDEPTH = ./$(VPATH)/$(DEPTH)
SUBDIRS = \ SUBDIRS = \
rpm \ rpm \

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
installer.dsp \ installer.dsp \

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
synergy.spec.in \ synergy.spec.in \

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ..
VDEPTH = ./$(VPATH)/$(DEPTH)
SUBDIRS = \ SUBDIRS = \
common \ common \

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
arch.dsp \ arch.dsp \
@ -97,5 +95,5 @@ EXTRA_libarch_a_SOURCES = \
XArchUnix.h \ XArchUnix.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
base.dsp \ base.dsp \
@ -59,6 +57,6 @@ libbase_a_SOURCES = \
XBase.h \ XBase.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
client.dsp \ client.dsp \
@ -31,12 +29,12 @@ libclient_a_SOURCES = \
CServerProxy.h \ CServerProxy.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
-I$(VDEPTH)/lib/mt \ -I$(top_srcdir)/lib/mt \
-I$(VDEPTH)/lib/io \ -I$(top_srcdir)/lib/io \
-I$(VDEPTH)/lib/net \ -I$(top_srcdir)/lib/net \
-I$(VDEPTH)/lib/synergy \ -I$(top_srcdir)/lib/synergy \
-I$(VDEPTH)/lib/platform \ -I$(top_srcdir)/lib/platform \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
common.dsp \ common.dsp \

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
io.dsp \ io.dsp \
@ -36,8 +34,8 @@ libio_a_SOURCES = \
XIO.h \ XIO.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
-I$(VDEPTH)/lib/mt \ -I$(top_srcdir)/lib/mt \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
mt.dsp \ mt.dsp \
@ -38,7 +36,7 @@ libmt_a_SOURCES = \
XThread.h \ XThread.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
net.dsp \ net.dsp \
@ -48,9 +46,9 @@ libnet_a_SOURCES = \
XSocket.h \ XSocket.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
-I$(VDEPTH)/lib/mt \ -I$(top_srcdir)/lib/mt \
-I$(VDEPTH)/lib/io \ -I$(top_srcdir)/lib/io \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
makehook.dsp \ makehook.dsp \
@ -69,10 +67,10 @@ libplatform_a_SOURCES = \
CXWindowsUtil.h \ CXWindowsUtil.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
-I$(VDEPTH)/lib/mt \ -I$(top_srcdir)/lib/mt \
-I$(VDEPTH)/lib/io \ -I$(top_srcdir)/lib/io \
-I$(VDEPTH)/lib/synergy \ -I$(top_srcdir)/lib/synergy \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
server.dsp \ server.dsp \
@ -43,12 +41,12 @@ libserver_a_SOURCES = \
CServer.h \ CServer.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
-I$(VDEPTH)/lib/mt \ -I$(top_srcdir)/lib/mt \
-I$(VDEPTH)/lib/io \ -I$(top_srcdir)/lib/io \
-I$(VDEPTH)/lib/net \ -I$(top_srcdir)/lib/net \
-I$(VDEPTH)/lib/synergy \ -I$(top_srcdir)/lib/synergy \
-I$(VDEPTH)/lib/platform \ -I$(top_srcdir)/lib/platform \
$(NULL) $(NULL)

View File

@ -12,8 +12,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
NULL = NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \ EXTRA_DIST = \
libsynergy.dsp \ libsynergy.dsp \
@ -60,10 +58,10 @@ libsynergy_a_SOURCES = \
XSynergy.h \ XSynergy.h \
$(NULL) $(NULL)
INCLUDES = \ INCLUDES = \
-I$(VDEPTH)/lib/common \ -I$(top_srcdir)/lib/common \
-I$(VDEPTH)/lib/arch \ -I$(top_srcdir)/lib/arch \
-I$(VDEPTH)/lib/base \ -I$(top_srcdir)/lib/base \
-I$(VDEPTH)/lib/mt \ -I$(top_srcdir)/lib/mt \
-I$(VDEPTH)/lib/io \ -I$(top_srcdir)/lib/io \
-I$(VDEPTH)/lib/net \ -I$(top_srcdir)/lib/net \
$(NULL) $(NULL)