always build with -fPIC to allow address space randomization

[catta] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d486f0076aea0271cd89171ff504acfffdcb656b..78957691b6da61f3fffcb4ea019447ea18e6f8c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,8 @@ EXTRA_DIST = \
        avahi-qt4.pc.in \
        avahi-sharp.pc.in \
        avahi-compat-libdns_sd.pc.in \
-       avahi-compat-howl.pc.in
+       avahi-compat-howl.pc.in \
+       avahi-ui.pc.in
 
 SUBDIRS = \
        common \
@@ -67,42 +68,69 @@ SUBDIRS = \
        tests \
        service-type-database \
        avahi-compat-libdns_sd \
-       avahi-compat-howl 
-
+       avahi-compat-howl \
+       avahi-autoipd \
+       avahi-ui
 
 DX_INPUT = \
-       $(srcdir)/avahi-core/core.h \
-       $(srcdir)/avahi-core/lookup.h \
-       $(srcdir)/avahi-core/publish.h \
        $(srcdir)/avahi-common/address.h \
-       $(srcdir)/avahi-core/rr.h \
        $(srcdir)/avahi-common/strlst.h \
        $(srcdir)/avahi-common/alternative.h \
-       $(srcdir)/avahi-core/log.h \
        $(srcdir)/avahi-common/defs.h \
-       $(srcdir)/avahi-client/client.h \
-       $(srcdir)/avahi-client/lookup.h \
-       $(srcdir)/avahi-client/publish.h \
        $(srcdir)/avahi-common/error.h \
        $(srcdir)/avahi-common/malloc.h \
        $(srcdir)/avahi-common/domain.h \
        $(srcdir)/avahi-common/watch.h \
        $(srcdir)/avahi-common/simple-watch.h \
        $(srcdir)/avahi-common/thread-watch.h \
-       $(srcdir)/avahi-glib/glib-watch.h \
-       $(srcdir)/avahi-glib/glib-malloc.h \
-       $(srcdir)/avahi-common/timeval.h \
-       $(srcdir)/avahi-qt/qt-watch.h
+       $(srcdir)/avahi-common/timeval.h
 
 DX_EXAMPLE_PATH = $(srcdir)/examples
-
 DX_EXAMPLE_PATTERNS = *.c
 
+if HAVE_QT3
+DX_INPUT += \
+       $(srcdir)/avahi-qt/qt-watch.h
+else
+if HAVE_QT4
+DX_INPUT += \
+       $(srcdir)/avahi-qt/qt-watch.h
+endif
+endif
+
+if HAVE_GLIB
+DX_INPUT += \
+       $(srcdir)/avahi-glib/glib-watch.h \
+       $(srcdir)/avahi-glib/glib-malloc.h
+endif
+
+if HAVE_DBUS
+DX_INPUT += \
+       $(srcdir)/avahi-client/client.h \
+       $(srcdir)/avahi-client/lookup.h \
+       $(srcdir)/avahi-client/publish.h
+endif
+
+if ENABLE_CORE_DOCS
+DX_INPUT += \
+       $(srcdir)/avahi-core/core.h \
+       $(srcdir)/avahi-core/lookup.h \
+       $(srcdir)/avahi-core/publish.h \
+       $(srcdir)/avahi-core/rr.h \
+       $(srcdir)/avahi-core/log.h
+endif
+
+if HAVE_GTK
+DX_INPUT += \
+       $(srcdir)/avahi-ui/avahi-ui.h
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = avahi-core.pc
 
 avahi-core.pc: avahi-core.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES = avahi-core.pc
@@ -113,6 +141,7 @@ pkgconfig_DATA += avahi-client.pc
 
 avahi-client.pc: avahi-client.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-client.pc
@@ -123,6 +152,7 @@ pkgconfig_DATA += avahi-compat-howl.pc
 
 avahi-compat-howl.pc: avahi-compat-howl.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
 
 CLEANFILES += avahi-compat-howl.pc
@@ -135,6 +165,7 @@ pkgconfig_DATA += avahi-compat-libdns_sd.pc
 
 avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-compat-libdns_sd.pc
@@ -162,18 +193,35 @@ pkgconfig_DATA += avahi-glib.pc
 
 avahi-glib.pc: avahi-glib.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-glib.pc
 
 endif
 
+if HAVE_GTK
+if HAVE_DBUS
+
+pkgconfig_DATA += avahi-ui.pc
+
+avahi-ui.pc: avahi-ui.pc.in
+       sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
+           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+CLEANFILES += avahi-ui.pc
+
+endif
+endif
+
 if HAVE_QT3
 
 pkgconfig_DATA += avahi-qt3.pc
 
 avahi-qt3.pc: avahi-qt3.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-qt3.pc
@@ -186,6 +234,7 @@ pkgconfig_DATA += avahi-qt4.pc
 
 avahi-qt4.pc: avahi-qt4.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-qt4.pc
@@ -201,7 +250,8 @@ homepage:
        $(MAKE) -C man
        scp avahi-daemon/*.introspect avahi-daemon/introspect.dtd avahi-daemon/introspect.xsl\
            man/*.xml man/xmltoman.dtd man/xmltoman.xsl \
-           fdo:public_html/
+           tango:www/avahi.org/tree/download/
+       scp avahi-$(PACKAGE_VERSION).tar.gz tango:www/avahi.org/tree/download/
        rm -rf doxygen
        $(MAKE) doxygen-run
        ssh tango rm -rf www/avahi.org/tree/download/doxygen