blob: 8f1dc3039c26aec2352e73e4550717fb2eef8199 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
--- avahi-qt/Makefile.in.orig 2008-07-03 14:37:05.000000000 -0500
+++ avahi-qt/Makefile.in 2008-07-03 14:39:27.000000000 -0500
@@ -93,7 +93,6 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = \
-@HAVE_QT3_TRUE@ ../avahi-common/libavahi-common.la \
@HAVE_QT3_TRUE@ $(am__DEPENDENCIES_1)
am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp
@HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS = \
@@ -104,7 +103,6 @@
$(CXXFLAGS) $(libavahi_qt3_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir)
@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = \
-@HAVE_QT4_TRUE@ ../avahi-common/libavahi-common.la \
@HAVE_QT4_TRUE@ $(am__DEPENDENCIES_1)
am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp
@HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS = \
@@ -400,7 +398,7 @@
@HAVE_QT3_TRUE@ qt-watch.cpp
@HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
-@HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
+@HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT3_LIBS)
@HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
@HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4
@HAVE_QT4_TRUE@avahiqt4include_HEADERS = \
@@ -410,7 +408,7 @@
@HAVE_QT4_TRUE@ qt-watch.cpp
@HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
-@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
+@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
@HAVE_QT4_TRUE@libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
CLEANFILES = $(BUILT_SOURCES)
all: $(BUILT_SOURCES)
|