X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-qt%2FMakefile.am;h=de135958621b12b66c15df88070ceae6baf6a9dd;hb=cce02bf638894512769ff026f5702c3e892a20f1;hp=c022b099619673b0b656185c4ed411467e60b27a;hpb=5a685a0f05389e671a32b01ef729dbb39cb39020;p=catta

diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am
index c022b09..de13595 100644
--- 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 += \
@@ -40,15 +40,15 @@ libavahi_qt3_la_SOURCES = \
 qt-watch.moc3: qt-watch.cpp
 	$(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 = \
+avahiqt4includedir=$(includedir)/avahi-qt4
+avahiqt4include_HEADERS = \
 	qt-watch.h 
 
 lib_LTLIBRARIES += \
@@ -62,10 +62,9 @@ libavahi_qt4_la_SOURCES = \
 qt-watch.moc4: qt-watch.cpp
 	$(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)