Discussion:
[libdvdcss-devel] [PATCH] build: proper dependencies for ChangeLog generation target
Diego Biurrun
2013-02-19 13:41:43 UTC
Permalink
This fixes the ChangeLog file getting continuously rebuilt instead
of after each Git commit, which is the case now.
---
Makefile.am | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 06ceb7f..9a6e49c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,11 @@ dist_doc_DATA = AUTHORS COPYING NEWS README ChangeLog

DISTCLEANFILES = ChangeLog

-ChangeLog: stamp-changelog
-
-stamp-changelog:
- -git log > ChangeLog-tmp
- test -s ChangeLog-tmp && mv ChangeLog-tmp ChangeLog
- -rm -f ChangeLog-tmp
- test -e ChangeLog || touch ChangeLog
+ChangeLog: $(srcdir)/.git/logs/HEAD
+ -cd $(srcdir) && git log > $(abs_builddir)/$(@)-tmp
+ test -s $(@)-tmp && mv $(@)-tmp $(@)
+ -rm -f $(@)-tmp
+ test -e $(@) || touch $(@)

lib_LTLIBRARIES = libdvdcss.la
EXTRA_PROGRAMS = csstest dvd_region
--
1.7.9.5
Diego Elio Pettenò
2013-02-19 13:51:04 UTC
Permalink
Post by Diego Biurrun
This fixes the ChangeLog file getting continuously rebuilt instead
of after each Git commit, which is the case now.
NAK. Rebuilding of it is intended. It works both within and without the
repository as is, after this patch it would fail from tarball.
--
Diego Elio Pettenò — Flameeyes
***@flameeyes.eu — http://blog.flameeyes.eu/
Diego Biurrun
2013-02-19 14:23:17 UTC
Permalink
This fixes the ChangeLog file getting continuously rebuilt instead
of after each Git commit, which is the case now.
---

Now works from within the release tarball as well, "make distcheck" passes.

Makefile.am | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 06ceb7f..65d2503 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,11 @@ dist_doc_DATA = AUTHORS COPYING NEWS README ChangeLog

DISTCLEANFILES = ChangeLog

-ChangeLog: stamp-changelog
-
-stamp-changelog:
- -git log > ChangeLog-tmp
- test -s ChangeLog-tmp && mv ChangeLog-tmp ChangeLog
- -rm -f ChangeLog-tmp
- test -e ChangeLog || touch ChangeLog
+ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD)
+ -cd $(srcdir) && git log > $(abs_builddir)/$(@)-tmp
+ test -s $(@)-tmp && mv $(@)-tmp $(@)
+ -rm -f $(@)-tmp
+ test -e $(@) || touch $(@)

lib_LTLIBRARIES = libdvdcss.la
EXTRA_PROGRAMS = csstest dvd_region
--
1.7.9.5
Diego Elio Pettenò
2013-02-19 14:28:16 UTC
Permalink
Post by Diego Biurrun
Now works from within the release tarball as well, "make distcheck" passes.
Hrm, LGTM, hopefully it won't break.
--
Diego Elio Pettenò — Flameeyes
***@flameeyes.eu — http://blog.flameeyes.eu/
Jean-Baptiste Kempf
2013-02-26 01:23:45 UTC
Permalink
Post by Diego Elio Pettenò
Post by Diego Biurrun
Now works from within the release tarball as well, "make distcheck" passes.
Hrm, LGTM, hopefully it won't break.
Ship it.
--
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device
Fabian Greffrath
2013-02-19 15:06:27 UTC
Permalink
Post by Diego Biurrun
+ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD)
Won't the latter two lines need "$(abs_builddir)/$(@)-tmp" as well?

- Fabian
Diego Biurrun
2013-02-19 15:51:31 UTC
Permalink
Post by Diego Biurrun
+ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD)
No, the command is run from the build directory; the first line only
needs it because of the cd.

Diego
Diego Biurrun
2013-02-26 08:10:46 UTC
Permalink
libdvdcss | branch: master | Diego Biurrun <***@biurrun.de> | Tue Feb 19 15:23:17 2013 +0100| [4742c52aa57ade08fc7b03bb0be871c978c9f782] | committer: Jean-Baptiste Kempf

build: proper dependencies for ChangeLog generation target

This fixes the ChangeLog file getting continuously rebuilt instead
of after each Git commit, which is the case now.
http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=4742c52aa57ade08fc7b03bb0be871c978c9f782
---

Makefile.am | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 06ceb7f..65d2503 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,11 @@ dist_doc_DATA = AUTHORS COPYING NEWS README ChangeLog

DISTCLEANFILES = ChangeLog

-ChangeLog: stamp-changelog
-
-stamp-changelog:
- -git log > ChangeLog-tmp
- test -s ChangeLog-tmp && mv ChangeLog-tmp ChangeLog
- -rm -f ChangeLog-tmp
- test -e ChangeLog || touch ChangeLog
+ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD)
+ -cd $(srcdir) && git log > $(abs_builddir)/$(@)-tmp
+ test -s $(@)-tmp && mv $(@)-tmp $(@)
+ -rm -f $(@)-tmp
+ test -e $(@) || touch $(@)

lib_LTLIBRARIES = libdvdcss.la
EXTRA_PROGRAMS = csstest dvd_region
Diego Biurrun
2013-02-27 07:09:19 UTC
Permalink
libdvdcss | branch: xdgcache | Diego Biurrun <***@biurrun.de> | Tue Feb 19 15:23:17 2013 +0100| [4742c52aa57ade08fc7b03bb0be871c978c9f782] | committer: Jean-Baptiste Kempf

build: proper dependencies for ChangeLog generation target

This fixes the ChangeLog file getting continuously rebuilt instead
of after each Git commit, which is the case now.
http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=4742c52aa57ade08fc7b03bb0be871c978c9f782
---

Makefile.am | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 06ceb7f..65d2503 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,11 @@ dist_doc_DATA = AUTHORS COPYING NEWS README ChangeLog

DISTCLEANFILES = ChangeLog

-ChangeLog: stamp-changelog
-
-stamp-changelog:
- -git log > ChangeLog-tmp
- test -s ChangeLog-tmp && mv ChangeLog-tmp ChangeLog
- -rm -f ChangeLog-tmp
- test -e ChangeLog || touch ChangeLog
+ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD)
+ -cd $(srcdir) && git log > $(abs_builddir)/$(@)-tmp
+ test -s $(@)-tmp && mv $(@)-tmp $(@)
+ -rm -f $(@)-tmp
+ test -e $(@) || touch $(@)

lib_LTLIBRARIES = libdvdcss.la
EXTRA_PROGRAMS = csstest dvd_region

Loading...