fixes to get vpath builds working (necessary for `make distcheck').

This commit is contained in:
crs 2002-07-31 17:34:05 +00:00
parent fae797e220
commit 5bb5542a13
14 changed files with 58 additions and 44 deletions

View File

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

View File

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

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
synergy.dsp \
@ -32,11 +33,11 @@ synergy_LDADD = \
$(X_EXTRA_LIBS) \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(DEPTH)/lib/io \
-I$(DEPTH)/lib/net \
-I$(DEPTH)/lib/synergy \
-I$(DEPTH)/lib/platform \
-I$(DEPTH)/lib/client \
-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 \
$(NULL)

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
synergyd.dsp \
@ -33,12 +34,12 @@ synergyd_LDADD = \
$(X_EXTRA_LIBS) \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(DEPTH)/lib/io \
-I$(DEPTH)/lib/http \
-I$(DEPTH)/lib/net \
-I$(DEPTH)/lib/synergy \
-I$(DEPTH)/lib/platform \
-I$(DEPTH)/lib/server \
-I$(VDEPTH)/lib/base \
-I$(VDEPTH)/lib/mt \
-I$(VDEPTH)/lib/io \
-I$(VDEPTH)/lib/http \
-I$(VDEPTH)/lib/net \
-I$(VDEPTH)/lib/synergy \
-I$(VDEPTH)/lib/platform \
-I$(VDEPTH)/lib/server \
$(NULL)

View File

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

View File

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

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
client.dsp \
@ -25,10 +26,10 @@ libclient_a_SOURCES = \
ISecondaryScreenFactory.h \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(DEPTH)/lib/io \
-I$(DEPTH)/lib/net \
-I$(DEPTH)/lib/synergy \
-I$(DEPTH)/lib/platform \
-I$(VDEPTH)/lib/base \
-I$(VDEPTH)/lib/mt \
-I$(VDEPTH)/lib/io \
-I$(VDEPTH)/lib/net \
-I$(VDEPTH)/lib/synergy \
-I$(VDEPTH)/lib/platform \
$(NULL)

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
http.dsp \
@ -18,7 +19,7 @@ libhttp_a_SOURCES = \
XHTTP.h \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(DEPTH)/lib/io \
-I$(VDEPTH)/lib/base \
-I$(VDEPTH)/lib/mt \
-I$(VDEPTH)/lib/io \
$(NULL)

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
io.dsp \
@ -29,6 +30,6 @@ libio_a_SOURCES = \
XIO.h \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(VDEPTH)/lib/base \
-I$(VDEPTH)/lib/mt \
$(NULL)

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
mt.dsp \
@ -27,5 +28,5 @@ libmt_a_SOURCES = \
XThread.h \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(VDEPTH)/lib/base \
$(NULL)

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
net.dsp \
@ -32,7 +33,7 @@ libnet_a_SOURCES = \
XSocket.h \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(DEPTH)/lib/io \
-I$(VDEPTH)/lib/base \
-I$(VDEPTH)/lib/mt \
-I$(VDEPTH)/lib/io \
$(NULL)

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
makehook.dsp \
@ -54,7 +55,7 @@ EXTRA_libplatform_a_SOURCES = \
CUnixPlatform.cpp \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(DEPTH)/lib/synergy \
-I$(VDEPTH)/lib/base \
-I$(VDEPTH)/lib/mt \
-I$(VDEPTH)/lib/synergy \
$(NULL)

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
server.dsp \
@ -33,11 +34,11 @@ libserver_a_SOURCES = \
IPrimaryScreenFactory.h \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(DEPTH)/lib/io \
-I$(DEPTH)/lib/http \
-I$(DEPTH)/lib/net \
-I$(DEPTH)/lib/synergy \
-I$(DEPTH)/lib/platform \
-I$(VDEPTH)/lib/base \
-I$(VDEPTH)/lib/mt \
-I$(VDEPTH)/lib/io \
-I$(VDEPTH)/lib/http \
-I$(VDEPTH)/lib/net \
-I$(VDEPTH)/lib/synergy \
-I$(VDEPTH)/lib/platform \
$(NULL)

View File

@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
NULL =
DEPTH = ../..
VDEPTH = ./$(VPATH)/$(DEPTH)
EXTRA_DIST = \
libsynergy.dsp \
@ -38,8 +39,8 @@ libsynergy_a_SOURCES = \
XSynergy.h \
$(NULL)
INCLUDES = \
-I$(DEPTH)/lib/base \
-I$(DEPTH)/lib/mt \
-I$(DEPTH)/lib/io \
-I$(DEPTH)/lib/net \
-I$(VDEPTH)/lib/base \
-I$(VDEPTH)/lib/mt \
-I$(VDEPTH)/lib/io \
-I$(VDEPTH)/lib/net \
$(NULL)