fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-qt / Makefile.am

diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am
index f09aca4121c1bd6b7d4f26bb144cbb1a69a24f59..64356a590cab50376b28263d0f8e54f4a5acd771 100644 (file)
--- a/avahi-qt/Makefile.am
+++ b/avahi-qt/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -19,15 +17,15 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-avahiincludedir=$(includedir)/avahi-qt
-
-lib_LTLIBRARIES = 
-BUILT_SOURCES = 
+lib_LTLIBRARIES =
+BUILT_SOURCES =
 
 if HAVE_QT3
 
-avahiinclude_HEADERS = \
-       qt-watch.h 
+avahiqt3includedir=$(includedir)/avahi-qt3
+
+avahiqt3include_HEADERS = \
+       qt-watch.h
 
 lib_LTLIBRARIES += \
        libavahi-qt3.la
@@ -35,21 +33,21 @@ lib_LTLIBRARIES += \
 BUILT_SOURCES += qt-watch.moc3
 
 libavahi_qt3_la_SOURCES = \
-       qt-watch.cpp 
+       qt-watch.cpp
 
 qt-watch.moc3: qt-watch.cpp
-       $(MOC_QT3) $^ > $@
+       $(AM_V_GEN)$(MOC_QT3) $^ > $@
 
-libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS)
+libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_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 = \
-       qt-watch.h 
+avahiqt4includedir=$(includedir)/avahi-qt4
+avahiqt4include_HEADERS = \
+       qt-watch.h
 
 lib_LTLIBRARIES += \
        libavahi-qt4.la
@@ -57,13 +55,14 @@ lib_LTLIBRARIES += \
 BUILT_SOURCES += qt-watch.moc4
 
 libavahi_qt4_la_SOURCES = \
-       qt-watch.cpp 
+       qt-watch.cpp
 
 qt-watch.moc4: qt-watch.cpp
-       $(MOC_QT4) $^ > $@
+       $(AM_V_GEN)$(MOC_QT4) $^ > $@
 
-libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4
+libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
 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) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
 endif
+
+CLEANFILES = $(BUILT_SOURCES)