From c10ea241e3da219126a6d6d3b9f88c359270e70d Mon Sep 17 00:00:00 2001 From: Lucas Bonnet Date: Wed, 11 Aug 2010 00:04:23 +0200 Subject: Makefile: add CFLAGS and $LDFLAGS, based on a patch by Christian Faulhammer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 080120c..2592883 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ docs: $(MAKE) -C $(DOCDIR) emms-print-metadata: $(SRCDIR)/emms-print-metadata.c - $(CC) -o $(SRCDIR)/$@ $< `taglib-config --cflags --libs` -ltag_c + $(CC) $(CFLAGS) $(LDFLAGS) -o $(SRCDIR)/$@ $< `taglib-config --cflags --libs` -ltag_c install: test -d $(SITELISP) || mkdir -p $(SITELISP) -- cgit v1.2.3 From d6ab4340d9c20f7aa501c66c557023365ae60f09 Mon Sep 17 00:00:00 2001 From: Lucas Bonnet Date: Wed, 11 Aug 2010 00:10:14 +0200 Subject: Makefile: now using Git, so get rid of darcs in ChangeLog Makefile target. Patch by Arnaud Fontaine --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2592883..936a2e3 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ MAN1DIR=$(PREFIX)/share/man/man1 SITELISP=$(PREFIX)/share/emacs/site-lisp/emms INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR) +CHANGELOG_CMD = git log --pretty=medium # The currently released version of EMMS VERSION=3.0 @@ -46,11 +47,8 @@ install: remove-info: $(INSTALLINFO) --remove emms.info -deb-install: - install -m 644 $(ALLSOURCE) $(SITELISP) - ChangeLog: - darcs changes > $@ + $(CHANGELOG_CMD) > $@ clean: -rm -f *~ $(DOCDIR)emms.info $(DOCDIR)emms.html emms-print-metadata @@ -61,7 +59,7 @@ dist: clean autoloads (cd .. && tar xf -) rm -f ../emms-$(VERSION)/.gitignore cp lisp/emms-auto.el ../emms-$(VERSION)/lisp - git log --pretty=medium > ../emms-$(VERSION)/ChangeLog + $(CHANGELOG_CMD) > ../emms-$(VERSION)/ChangeLog release: dist (cd .. && tar -czf emms-$(VERSION).tar.gz \ -- cgit v1.2.3 From e6aba649520ec44425060863e1c35ed01c53fd4b Mon Sep 17 00:00:00 2001 From: Lucas Bonnet Date: Wed, 11 Aug 2010 14:14:18 +0200 Subject: Makefile: the clean target now removes emms-print-metadata binary in src/ --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 936a2e3..a07a790 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ ChangeLog: $(CHANGELOG_CMD) > $@ clean: - -rm -f *~ $(DOCDIR)emms.info $(DOCDIR)emms.html emms-print-metadata + -rm -f *~ $(DOCDIR)emms.info $(DOCDIR)emms.html $(SRCDIR)/emms-print-metadata $(MAKE) -C $(LISPDIR) clean dist: clean autoloads -- cgit v1.2.3