Fix compilation with -pthread

[catta] / avahi-qt / Makefile.am

diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am
index c022b099619673b0b656185c4ed411467e60b27a..4cd047b684db46ce076e6ac9d19e9bfe0e47eb40 100644 (file)
--- a/avahi-qt/Makefile.am
+++ b/avahi-qt/Makefile.am
@@ -19,14 +19,14 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-avahiincludedir=$(includedir)/avahi-qt
-
 lib_LTLIBRARIES = 
 BUILT_SOURCES = 
 
 if HAVE_QT3
 
-avahiinclude_HEADERS = \
+avahiqt3includedir=$(includedir)/avahi-qt3
+
+avahiqt3include_HEADERS = \
        qt-watch.h 
 
 lib_LTLIBRARIES += \
@@ -42,13 +42,14 @@ qt-watch.moc3: qt-watch.cpp
 
 libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS)
 libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
-libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
+libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
 
 endif
 
 if HAVE_QT4
 
-avahiinclude_HEADERS = \
+avahiqt4includedir=$(includedir)/avahi-qt4
+avahiqt4include_HEADERS = \
        qt-watch.h 
 
 lib_LTLIBRARIES += \
@@ -64,7 +65,7 @@ qt-watch.moc4: qt-watch.cpp
 
 libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4
 libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
-libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
+libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT4_VERSION_INFO)
 
 endif