From 4cde6afac4bcf5beb242ddfff6dd34b7d202ec0f Mon Sep 17 00:00:00 2001 From: Alexander Orlenko Date: Wed, 14 Jul 2010 17:30:28 +1100 Subject: Fix Makefile.am's --- Makefile.am | 11 +++++++++++ src/Makefile.am | 10 ++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index af437a6..abde0af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1,12 @@ +BUILT_SOURCES = $(top_srcdir)/.version + +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ + +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + +CLEANFILES = $(top_srcdir)/.version + SUBDIRS = src + diff --git a/src/Makefile.am b/src/Makefile.am index c295af2..aab0406 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,16 +11,10 @@ AM_LDFLAGS = $(DBUS_LIBS) $(GLIB_LIBS) $(GOBJECT_LIBS) $(GIO_LIBS) $(DBUS_GLIB_L #lib/marshallers.c: lib/marshallers.list # glib-genmarshal $(GENMARSHAL_FLAGS) --body lib/marshallers.list > lib/marshallers.c -BUILT_SOURCES = $(top_srcdir)/.version - -$(top_srcdir)/.version: - echo $(VERSION) > $@-t && mv $@-t $@ -dist-hook: - echo $(VERSION) > $(distdir)/.tarball-version - lib_sources = lib/marshallers.c lib/marshallers.h \ lib/dbus-common.c lib/dbus-common.h \ lib/helpers.c lib/helpers.h \ + lib/bluez-dbus.h \ lib/adapter.c lib/adapter.h \ lib/agent.c lib/agent.h \ lib/audio.c lib/audio.h \ @@ -45,4 +39,4 @@ bt_network_SOURCES = $(lib_sources) bt-network.c bt_serial_SOURCES = $(lib_sources) bt-serial.c #CLEANFILES = Makefile.in lib/marshallers.c lib/marshallers.h -CLEANFILES = $(top_srcdir)/.version + -- cgit v1.2.1