diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | avahi-client/Makefile.am | 2 | ||||
| -rw-r--r-- | avahi-common/Makefile.am | 29 | ||||
| -rw-r--r-- | avahi-daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/overview.dia | 3 |
5 files changed, 19 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 88c1704..18640f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,3 +90,7 @@ homepage: scp avahi-daemon/*.introspect avahi-daemon/introspect.dtd avahi-daemon/introspect.xsl\ man/*.xml man/xmltoman.dtd man/xmltoman.xsl \ fdo:public_html/ + rm -rf doxygen + $(MAKE) doxygen-run + ssh fdo rm -rf public_html/doxygen + scp -r doxygen/html fdo:public_html/doxygen diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am index 1aff288..972aba9 100644 --- a/avahi-client/Makefile.am +++ b/avahi-client/Makefile.am @@ -38,7 +38,7 @@ libavahi_client_la_SOURCES = \ entrygroup.c \ browser.c libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-watch-glue-pic.la +libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common.la libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0 client_test_SOURCES = client-test.c diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am index 1ea7ba4..5556ff4 100644 --- a/avahi-common/Makefile.am +++ b/avahi-common/Makefile.am @@ -22,9 +22,6 @@ AM_CFLAGS=-I$(top_srcdir) # This cool debug trap works on i386/gcc only AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' -# Need some DBUS defines for dbus.h -AM_CFLAGS+=$(DBUS_CFLAGS) - avahi_commonincludedir=$(includedir)/avahi-common avahi_commoninclude_HEADERS = \ @@ -63,8 +60,7 @@ libavahi_common_la_SOURCES = \ domain.c domain.h \ timeval.c timeval.h \ simple-watch.c simple-watch.h \ - watch.h gccmacro.h \ - dbus.c dbus.h + watch.h gccmacro.h libavahi_common_la_CFLAGS = $(AM_CFLAGS) libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0 @@ -108,17 +104,18 @@ noinst_HEADERS += \ dbus-watch-glue.h noinst_LTLIBRARIES = \ - libdbus-watch-glue.la \ - libdbus-watch-glue-pic.la - -libdbus_watch_glue_la_SOURCES = \ - dbus-watch-glue.h dbus-watch-glue.c -libdbus_watch_glue_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -libdbus_watch_glue_la_LDFLAGS = $(AM_LDFLAGS) -all-static - -libdbus_watch_glue_pic_la_SOURCES = $(libdbus_watch_glue_la_SOURCES) -libdbus_watch_glue_pic_la_CFLAGS = $(libdbus_watch_glue_la_CFLAGS) -fPIC -libdbus_watch_glue_pic_la_LDFLAGS = $(libdbus_watch_glue_la_LDFLAGS) + libdbus-common.la \ + libdbus-common-pic.la + +libdbus_common_la_SOURCES = \ + dbus-watch-glue.h dbus-watch-glue.c \ + dbus.h dbus.c +libdbus_common_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +libdbus_common_la_LDFLAGS = $(AM_LDFLAGS) -all-static + +libdbus_common_pic_la_SOURCES = $(libdbus_common_la_SOURCES) +libdbus_common_pic_la_CFLAGS = $(libdbus_common_la_CFLAGS) -fPIC +libdbus_common_pic_la_LDFLAGS = $(libdbus_common_la_LDFLAGS) endif diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am index 558c55a..32831ba 100644 --- a/avahi-daemon/Makefile.am +++ b/avahi-daemon/Makefile.am @@ -76,7 +76,7 @@ avahi_daemon_SOURCES += \ dbus-protocol.h avahi_daemon_LDADD += \ - ../avahi-common/libdbus-watch-glue.la \ + ../avahi-common/libdbus-common.la \ $(DBUS_LIBS) avahi_daemon_CFLAGS += $(DBUS_CFLAGS) diff --git a/docs/overview.dia b/docs/overview.dia index ed980bd..5e09c69 100644 --- a/docs/overview.dia +++ b/docs/overview.dia @@ -442,9 +442,6 @@ <dia:attribute name="elem_height"> <dia:real val="2"/> </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#ff0000"/> - </dia:attribute> <dia:attribute name="show_background"> <dia:boolean val="true"/> </dia:attribute> |