diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-22 14:53:27 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-22 15:15:25 +1000 |
| commit | 6f855ac348db34726eac68dc114563543ff0eae2 (patch) | |
| tree | 7f7eec06f02f7641d4caaf3f4e735cecbc7881ee | |
| parent | 7cb41b467a161461627e6abf1ea979b7058d02f0 (diff) | |
Fix make distcheck allowing custom build directories.
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | tools/Makefile.am | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 844a972..6848537 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,14 +18,12 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -SHARED_DIR = $(top_srcdir)/shared - @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -@DRIVER_NAME@_drv_la_LIBADD = $(SHARED_DIR)/lib@DRIVER_NAME@.la +@DRIVER_NAME@_drv_la_LIBADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la @DRIVER_NAME@_drv_ladir = @inputdir@ -INCLUDES = -I$(SHARED_DIR) +INCLUDES = -I$(top_srcdir)/shared @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c xf86OSmouse.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 9236c5f..c00d65d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,11 +20,10 @@ bin_PROGRAMS = @DRIVER_NAME@_detect -SHARED_PATH = $(top_srcdir)/shared -INCLUDES = -I$(SHARED_PATH) +INCLUDES = -I$(top_srcdir)/shared @DRIVER_NAME@_detect_SOURCES = vmmouse_detect.c -@DRIVER_NAME@_detect_LDADD = $(SHARED_PATH)/lib@DRIVER_NAME@.la +@DRIVER_NAME@_detect_LDADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la calloutsdir=$(HAL_CALLOUTS_DIR) callouts_SCRIPTS = hal-probe-vmmouse @@ -32,7 +31,7 @@ callouts_SCRIPTS = hal-probe-vmmouse hal-probe-vmmouse: sed -e 's|__BIN_PREFIX__|$(bindir)|g' \ -e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \ - < $@.in > $@ + < $(srcdir)/$@.in > $@ EXTRA_DIST = hal-probe-vmmouse.in |