fix detection whether an interface has a routable address assigned on BSD. Patch...

[catta] / avahi-qt / Makefile.am

diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am
index ebf454cd49048b71b7373dadb40319feb8a527eb..4cd047b684db46ce076e6ac9d19e9bfe0e47eb40 100644 (file)
--- a/avahi-qt/Makefile.am
+++ b/avahi-qt/Makefile.am
@@ -1,13 +1,32 @@
-AM_CFLAGS=-I$(top_srcdir)
+# $Id$
+
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
 
-avahiincludedir=$(includedir)/avahi-qt
+AM_CFLAGS=-I$(top_srcdir)
 
 lib_LTLIBRARIES = 
 BUILT_SOURCES = 
 
 if HAVE_QT3
 
-avahiinclude_HEADERS = \
+avahiqt3includedir=$(includedir)/avahi-qt3
+
+avahiqt3include_HEADERS = \
        qt-watch.h 
 
 lib_LTLIBRARIES += \
@@ -18,20 +37,19 @@ BUILT_SOURCES += qt-watch.moc3
 libavahi_qt3_la_SOURCES = \
        qt-watch.cpp 
 
-qt-watch.moc3: 
-       $(MOC_QT3) qt-watch.cpp > $@
-
+qt-watch.moc3: qt-watch.cpp
+       $(MOC_QT3) $^ > $@
 
 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:1: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 += \
@@ -42,12 +60,13 @@ BUILT_SOURCES += qt-watch.moc4
 libavahi_qt4_la_SOURCES = \
        qt-watch.cpp 
 
-qt-watch.moc4: 
-       $(MOC_QT4) qt-watch.cpp > $@
-
+qt-watch.moc4: qt-watch.cpp
+       $(MOC_QT4) $^ > $@
 
 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:1:0
+libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT4_VERSION_INFO)
+
+endif
 
-endif
\ No newline at end of file
+CLEANFILES = $(BUILT_SOURCES)