diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-19 13:34:01 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-19 13:34:01 +0000 |
| commit | 1ff162d58059b9552c2b5594779eff9e0f215482 (patch) | |
| tree | c21bf72f2390d87c9c16c32266ac4504855ededa /avahi-common | |
| parent | 9642bac4b85de24ce62c53ad6a8e2ab4b2dd31ba (diff) | |
rename libdbus-watch-glue to libdbus-common
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@355 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-common')
| -rw-r--r-- | avahi-common/Makefile.am | 29 |
1 files changed, 13 insertions, 16 deletions
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 |