From a48d8b4639f36e6fc2d7e87cac92e178674caaa1 Mon Sep 17 00:00:00 2001 From: Max Krasnyansky Date: Fri, 8 Mar 2002 21:10:06 +0000 Subject: Initial revision --- Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Makefile.am (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..64e1a183 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,5 @@ +# +# $Id$ +# + +SUBDIRS = include src -- cgit From aced690cd4c623607a5ac1ebc0bb12b8b213fac8 Mon Sep 17 00:00:00 2001 From: Max Krasnyansky Date: Tue, 12 Mar 2002 18:59:15 +0000 Subject: Cleanup. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 64e1a183..c744d8fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,3 +3,5 @@ # SUBDIRS = include src + +DISTCLEANFILES = conftest.c conftest -- cgit From 8e9ea9b77e3c4eaf1f1813cfa1e275c7b7ef219a Mon Sep 17 00:00:00 2001 From: Max Krasnyansky Date: Fri, 17 May 2002 01:09:28 +0000 Subject: Fix "make dist" --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index c744d8fe..d00fd392 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,3 +5,5 @@ SUBDIRS = include src DISTCLEANFILES = conftest.c conftest + +EXTRA_DIST = ChangeLog -- cgit From 9bf1d0ca2ad3beefb98c8f1a08c8188dfaedf579 Mon Sep 17 00:00:00 2001 From: Max Krasnyansky Date: Mon, 27 May 2002 02:25:33 +0000 Subject: Libtoolize and fix top level build. Make cleanup. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index d00fd392..bc2d6cb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -SUBDIRS = include src +SUBDIRS := include src DISTCLEANFILES = conftest.c conftest -- cgit From 2ac228bc6fcc7a6f2b1368f39cb392b61c984608 Mon Sep 17 00:00:00 2001 From: Max Krasnyansky Date: Sat, 21 Dec 2002 05:17:15 +0000 Subject: Add RPM spec file. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index bc2d6cb2..2f4de561 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,4 +6,4 @@ SUBDIRS := include src DISTCLEANFILES = conftest.c conftest -EXTRA_DIST = ChangeLog +EXTRA_DIST = ChangeLog libs.spec -- cgit From 72c595e96c615d138d37d204152d3f71a60f02d1 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 3 Jun 2004 10:05:20 +0000 Subject: Add PKGConfig support --- Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 2f4de561..2de6775b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,9 @@ SUBDIRS := include src -DISTCLEANFILES = conftest.c conftest +DISTCLEANFILES = conftest.c conftest bluez.pc EXTRA_DIST = ChangeLog libs.spec + +install-data-local: + $(INSTALL) -D -m 755 $(top_builddir)/bluez.pc $(DESTDIR)$(libdir)/pkgconfig/bluez.pc -- cgit From 7ab16cfb4cff8e163fc287b12157929b33c0a4c4 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 7 Jul 2004 15:55:31 +0000 Subject: Change permission for bluez.pc file --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 2de6775b..c4fc53e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,5 +8,5 @@ DISTCLEANFILES = conftest.c conftest bluez.pc EXTRA_DIST = ChangeLog libs.spec -install-data-local: - $(INSTALL) -D -m 755 $(top_builddir)/bluez.pc $(DESTDIR)$(libdir)/pkgconfig/bluez.pc +install-data-local: bluez.pc + $(INSTALL) -D -m 644 $(top_builddir)/bluez.pc $(DESTDIR)$(libdir)/pkgconfig/bluez.pc -- cgit From 3429ef600fcef09e96408f8b476ead6cb519cf83 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 21 Jul 2004 13:30:34 +0000 Subject: Make use of MAINTAINERCLEANFILES --- Makefile.am | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index c4fc53e6..34e8e0a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,11 +2,18 @@ # $Id$ # -SUBDIRS := include src - -DISTCLEANFILES = conftest.c conftest bluez.pc +SUBDIRS = include src EXTRA_DIST = ChangeLog libs.spec +DISTCLEANFILES = bluez.pc + +MAINTAINERCLEANFILES = Makefile.in \ + aclocal.m4 configure config.h.in config.sub config.guess \ + ltmain.sh missing install-sh mkinstalldirs + install-data-local: bluez.pc - $(INSTALL) -D -m 644 $(top_builddir)/bluez.pc $(DESTDIR)$(libdir)/pkgconfig/bluez.pc + $(INSTALL) -D -m 644 $(top_builddir)/$< $(DESTDIR)$(libdir)/pkgconfig/$< + +uninstall-local: bluez.pc + @rm -f $(DESTDIR)$(libdir)/pkgconfig/$< -- cgit From 8d358dc737350567d81161e9fce4335392508e3a Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 21 Jul 2004 15:31:20 +0000 Subject: No need to add ChangeLog to EXTRA_DIST --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 34e8e0a7..538873b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = include src -EXTRA_DIST = ChangeLog libs.spec +EXTRA_DIST = libs.spec DISTCLEANFILES = bluez.pc -- cgit From 510555837596e01a69cdcc40a7ffdafeeabd80cd Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 28 Jul 2004 07:09:49 +0000 Subject: Use simpler way to install bluez.pc --- Makefile.am | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 538873b1..dde46889 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,10 @@ SUBDIRS = include src +pkgconfigdir = $(libdir)/pkgconfig + +pkgconfig_DATA = bluez.pc + EXTRA_DIST = libs.spec DISTCLEANFILES = bluez.pc @@ -11,9 +15,3 @@ DISTCLEANFILES = bluez.pc MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ ltmain.sh missing install-sh mkinstalldirs - -install-data-local: bluez.pc - $(INSTALL) -D -m 644 $(top_builddir)/$< $(DESTDIR)$(libdir)/pkgconfig/$< - -uninstall-local: bluez.pc - @rm -f $(DESTDIR)$(libdir)/pkgconfig/$< -- cgit From c2ce952c89bf07118d8d4d174979cc41fe047065 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 29 Jul 2004 09:26:14 +0000 Subject: Remove RPM spec file --- Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index dde46889..c3075ae1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,8 +8,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = bluez.pc -EXTRA_DIST = libs.spec - DISTCLEANFILES = bluez.pc MAINTAINERCLEANFILES = Makefile.in \ -- cgit From 518528c36107e8ea6d11b59c97e241f2fec208f3 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 23 Nov 2004 06:46:40 +0000 Subject: Add simple AM_PATH_BLUEZ macro --- Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index c3075ae1..4dbfb31a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,12 @@ SUBDIRS = include src +aclocaldir = $(datadir)/aclocal + +aclocal_DATA = bluez.m4 + +EXTRA_DIST = $(aclocal_DATA) + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = bluez.pc -- cgit From 0b7448998d6d60adfb99be292b80706666257750 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 21 Apr 2005 21:48:57 +0000 Subject: Remove depcomp file --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 4dbfb31a..0585ddd3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,4 +18,4 @@ DISTCLEANFILES = bluez.pc MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ - ltmain.sh missing install-sh mkinstalldirs + ltmain.sh depcomp missing install-sh mkinstalldirs -- cgit From c0d524486a50e8366c12c5ebea1a4441e9db46aa Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 29 Oct 2005 19:25:42 +0000 Subject: Big cleanup of CVS relics --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 0585ddd3..0010ae58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,3 @@ -# -# $Id$ -# SUBDIRS = include src -- cgit From 00eb7685233f2061c9b752f453bca7aa10a5c576 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 8 Dec 2007 21:46:12 +0000 Subject: Improve build system --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 0010ae58..b51795a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = bluez.pc -DISTCLEANFILES = bluez.pc +DISTCLEANFILES = $(pkgconfig_DATA) MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ -- cgit