From c34c80055a29e8d7ba8d9b3d8c9eb13d73050447 Mon Sep 17 00:00:00 2001 From: Jeremy Henty Date: Fri, 28 Jan 2011 07:09:51 +0000 Subject: **/Makefile.am: replace .. paths with absolute paths using $(top_builddir). --- dpi/Makefile.am | 36 ++++++++++++---- dpid/Makefile.am | 8 +++- test/Makefile.am | 128 +++++++++++++++++++++++++++---------------------------- 3 files changed, 97 insertions(+), 75 deletions(-) diff --git a/dpi/Makefile.am b/dpi/Makefile.am index 34e07483..3e47b9f3 100644 --- a/dpi/Makefile.am +++ b/dpi/Makefile.am @@ -17,15 +17,33 @@ file_PROGRAMS = file.dpi cookies_PROGRAMS = cookies.dpi datauri_PROGRAMS = datauri.filter.dpi -bookmarks_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a -downloads_dpi_LDADD = @LIBFLTK_LIBS@ ../dpip/libDpip.a ../dlib/libDlib.a -ftp_filter_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a -https_filter_dpi_LDADD = @LIBSSL_LIBS@ ../dpip/libDpip.a ../dlib/libDlib.a -hello_filter_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a -vsource_filter_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a -file_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a -cookies_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a -datauri_filter_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a +bookmarks_dpi_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +downloads_dpi_LDADD = @LIBFLTK_LIBS@ \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +ftp_filter_dpi_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +https_filter_dpi_LDADD = @LIBSSL_LIBS@ \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +hello_filter_dpi_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +vsource_filter_dpi_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +file_dpi_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +cookies_dpi_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +datauri_filter_dpi_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a downloads_dpi_CXXFLAGS = @LIBFLTK_CXXFLAGS@ diff --git a/dpid/Makefile.am b/dpid/Makefile.am index 2b81a98a..07e262c8 100644 --- a/dpid/Makefile.am +++ b/dpid/Makefile.am @@ -1,8 +1,12 @@ AM_CPPFLAGS=-DDPIDRC_SYS='"$(sysconfdir)/dpidrc"' bin_PROGRAMS = dpid dpidc -dpid_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a -dpidc_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a +dpid_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a +dpidc_LDADD = \ + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a EXTRA_DIST = dpidrc.in diff --git a/test/Makefile.am b/test/Makefile.am index 42dd7547..5f24654c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -23,115 +23,115 @@ noinst_PROGRAMS = \ dw_anchors_test_SOURCES = dw_anchors_test.cc dw_anchors_test_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_example_SOURCES = dw_example.cc dw_example_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_find_test_SOURCES = dw_find_test.cc dw_find_test_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_links_SOURCES = dw_links.cc dw_links_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_links2_SOURCES = dw_links2.cc dw_links2_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_images_simple_SOURCES = dw_images_simple.cc dw_images_simple_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_images_scaled_SOURCES = dw_images_scaled.cc dw_images_scaled_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_images_scaled2_SOURCES = dw_images_scaled2.cc dw_images_scaled2_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_lists_SOURCES = dw_lists.cc dw_lists_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_table_aligned_SOURCES = dw_table_aligned.cc dw_table_aligned_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_table_SOURCES = dw_table.cc dw_table_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_border_test_SOURCES = dw_border_test.cc dw_border_test_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_imgbuf_mem_test_SOURCES = dw_imgbuf_mem_test.cc dw_imgbuf_mem_test_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_resource_test_SOURCES = dw_resource_test.cc dw_resource_test_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ dw_ui_test_SOURCES = \ @@ -139,10 +139,10 @@ dw_ui_test_SOURCES = \ form.cc \ form.hh dw_ui_test_LDADD = \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBFLTK_LIBS@ fltk_browser_SOURCES = fltk_browser.cc @@ -150,10 +150,10 @@ fltk_browser_LDADD = @LIBFLTK_LIBS@ shapes_SOURCES = shapes.cc shapes_LDADD = \ - ../dw/libDw-core.a \ - ../lout/liblout.a + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a cookies_SOURCES = cookies.c cookies_LDADD = \ - ../dpip/libDpip.a \ - ../dlib/libDlib.a + $(top_builddir)/dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a -- cgit v1.2.3