diff options
author | Bastien Nocera <hadess@src.gnome.org> | 2009-02-25 14:39:30 +0000 |
---|---|---|
committer | Bastien Nocera <hadess@src.gnome.org> | 2009-02-25 14:39:30 +0000 |
commit | a02d31b327dc7e4cf3396168cef4a5d39880a9d7 (patch) | |
tree | d447dec4d2c9750aa8689ef316b6660b54802992 /common | |
parent | cbebcefa35556248596b3cf9657a648583fc4f95 (diff) | |
download | gnome-bluetooth-a02d31b327dc7e4cf3396168cef4a5d39880a9d7.tar.gz |
Clean up cflags/libs checking
Do the pkg-config checks for each program and lib, not for each
required lib, allows pkg-config to merge the lists.
Update pkg-config file
svn path=/trunk/; revision=328
Diffstat (limited to 'common')
-rw-r--r-- | common/Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index fdf93704..c54b94e6 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -8,14 +8,18 @@ libcommon_la_SOURCES = helper.h helper.c \ bluetooth-agent.h bluetooth-agent.c \ obex-agent.h obex-agent.c \ helper.c helper.h +libcommon_la_LIBADD = $(LIBGNOMEBT_LIBS) libgnome_bluetooth_1_0_la_SOURCES = \ bluetooth-client.h bluetooth-client.c \ marshal.h marshal.c \ bluetooth-device-selection.c bluetooth-device-selection.h -libgnome_bluetooth_1_0_la_LIBADD = $(GTK_LIBS) $(DBUS_LIBS) +libgnome_bluetooth_1_0_la_LIBADD = $(LIBGNOMEBT_LIBS) -AM_CFLAGS = -I$(srcdir) @DBUS_CFLAGS@ @GTK_CFLAGS@ $(WARN_CFLAGS) $(DISABLE_DEPRECATED) +gnomebluetoothdir = $(pkgincludedir) +gnomebluetooth_HEADERS = bluetooth-device-selection.c bluetooth-device-selection.h + +AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) BUILT_SOURCES = marshal.h marshal.c \ bluetooth-instance-glue.h \ @@ -47,7 +51,7 @@ marshal.h: marshal.list $(GLIB_GENMARSHAL) --prefix=marshal $< --header > $@ marshal.c: marshal.list - $(GLIB_GENMARSHAL) --prefix=marshal $< --body > $@ + $(GLIB_GENMARSHAL) --prefix=marshal $< --header --body > $@ bluetooth-instance-glue.h: bluetooth-instance.xml $(DBUS_BINDING_TOOL) --prefix=bluetooth_instance --mode=glib-server --output=$@ $< |