Show
Ignore:
Timestamp:
05/06/06 01:40:30 (18 years ago)
Author:
wagi
Message:

This patch fixes two issues when building:

  • libfreebob include files aren't found when build dir != source dir
  • some libraries aren't found when they're not in a system install dir

Jeremy Kerr

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libfreebob/tests/Makefile.am

    r185 r192  
    2525 
    2626test_freebob_SOURCES = test-freebob.c 
    27 test_freebob_LDADD   = $(top_builddir)/src/libfreebob.la $(LIBXML_LIBS) -lavc1394 
     27test_freebob_LDADD   = $(top_builddir)/src/libfreebob.la \ 
     28        $(LIBXML_LIBS) $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS) 
    2829 
    2930test_extplugcmd_SOURCES = test-extplugcmd.cpp 
    30 test_extplugcmd_LDADD = $(top_builddir)/src/libfreebobavc/libfreebobavc.la -lavc1394 
     31test_extplugcmd_LDADD = $(top_builddir)/src/libfreebobavc/libfreebobavc.la \ 
     32        $(LIBAVC1394_LIBS) 
    3133 
    3234freebob_server_SOURCES = freebob-server.c 
    33 freebob_server_LDADD   = $(top_builddir)/src/libfreebob.la $(LIBXML_LIBS) -lavc1394 -lrom1394 
     35freebob_server_LDADD   = $(top_builddir)/src/libfreebob.la $(LIBXML_LIBS) \ 
     36        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS) -lrom1394 
    3437 
    3538 
  • trunk/libfreebob/tests/streaming/Makefile.am

    r183 r192  
    1717# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1818 
    19 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src 
     19INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(LIBIEC61883_CFLAGS)  
    2020 
    2121noinst_PROGRAMS = teststreaming teststreaming2 teststreaming3 testmidistreaming1 
     
    2323 
    2424teststreaming_SOURCES = teststreaming.c debugtools.c 
    25 teststreaming_LDADD   = @top_builddir@src/libfreebob.la -lavc1394  
     25teststreaming_LDADD   = @top_builddir@src/libfreebob.la \ 
     26        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS) 
    2627 
    2728teststreaming2_SOURCES = teststreaming2.c debugtools.c 
    28 teststreaming2_LDADD   = @top_builddir@src/libfreebob.la -lavc1394 
     29teststreaming2_LDADD   = @top_builddir@src/libfreebob.la \ 
     30        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS) 
    2931 
    3032teststreaming3_SOURCES = teststreaming3.c debugtools.c 
    31 teststreaming3_LDADD   = @top_builddir@src/libfreebob.la -lavc1394 
     33teststreaming3_LDADD   = @top_builddir@src/libfreebob.la \ 
     34        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS) 
    3235 
    3336testmidistreaming1_SOURCES = testmidistreaming1.c debugtools.c 
    34 testmidistreaming1_LDADD   = @top_builddir@src/libfreebob.la -lasound -lavc1394 
     37testmidistreaming1_LDADD   = @top_builddir@src/libfreebob.la -lasound \ 
     38        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)