diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
| commit | 8cc5595d9091b484b9a4abe314c0f3ec055e0581 (patch) | |
| tree | 0d20c6f621673dbdb6095fb4854077152c1d9b40 /common/Makefile.am | |
| parent | 884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff) | |
Make it possible to support an embedded GLib
Diffstat (limited to 'common/Makefile.am')
| -rw-r--r-- | common/Makefile.am | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index a92ff9a3..412786c9 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -11,30 +11,21 @@ else notify_sources = notify-dummy.c endif -if GLIB -glib_sources = -glib_cflags = @GLIB_CFLAGS@ -else -glib_sources = glib-ectomy.c -glib_cflags = -endif - noinst_LIBRARIES = libhelper.a libhelper_a_SOURCES = oui.h oui.c dbus.h dbus.c \ textfile.h textfile.c logging.h logging.c \ dbus-helper.h dbus-helper.c \ sdp-xml.h sdp-xml.c $(sdp_sources) \ - notify.h $(notify_sources) \ - glib-ectomy.h $(glib_sources) + notify.h $(notify_sources) noinst_PROGRAMS = test_textfile test_textfile_LDADD = libhelper.a -AM_CFLAGS = @DBUS_CFLAGS@ $(glib_cflags) +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ EXTRA_DIST = ppoll.h sdp-dummy.c sdp-expat.c \ - notify-dummy.c notify-inotify.c glib-ectomy.c + notify-dummy.c notify-inotify.c MAINTAINERCLEANFILES = Makefile.in |