Changeset ca1fb26a for Makefile.am

Timestamp:

Aug 11, 2013, 4:36:03 PM (9 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

f1a71c8, 441fd42, 883b421

Parents:

685cca7

git-author:

Anders Kaseorg <andersk@mit.edu> (06/20/13 12:08:41)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/11/13 16:36:03)

Message:

Be smarter about rebuilding on version number changes

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• Makefile.am (modified) (7 diffs)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
 
-GIT_DESCRIPTION := $(if $(wildcard .git),$(shell git describe --match='barnowl-*' HEAD 2>/dev/null))
-GIT_FLAGS := $(if $(GIT_DESCRIPTION),-DGIT_VERSION=$(GIT_DESCRIPTION:barnowl-%=%))
+GIT_DESCRIPTION := $(if $(wildcard $(srcdir)/.git),$(shell cd $(srcdir) && git describe --match='barnowl-*' HEAD 2>/dev/null))
+VERSION = $(if $(GIT_DESCRIPTION),$(GIT_DESCRIPTION:barnowl-%=%),@VERSION@)
+-include BUILD_VERSION.mk
+
+FORCE:
+BUILD_VERSION.mk: $(if $(filter-out $(BUILD_VERSION),$(VERSION)),FORCE)
+        echo 'BUILD_VERSION = $(VERSION)' > $@
 
 bin_PROGRAMS = bin/barnowl
@@ -9 +14 @@
 endif
 
-zcrypt_SOURCES = zcrypt.c filterproc.c
+zcrypt_SOURCES = zcrypt.c filterproc.c version.c
 
 check_PROGRAMS = bin/tester
@@ -47 +52 @@
            -I$(top_srcdir)/libfaim/ \
            -DDATADIR='"$(pkgdatadir)"' \
-           -DBINDIR='"$(bindir)"' \
-           $(GIT_FLAGS)
+           -DBINDIR='"$(bindir)"'
 
 CODELIST_SRCS=message.c mainwin.c popwin.c zephyr.c messagelist.c \
@@ -64 +68 @@
 BASE_SRCS = $(CODELIST_SRCS) $(NORMAL_SRCS)
 
-GEN_C = varstubs.c perlglue.c gmarshal_funcs.c
+GEN_C = varstubs.c perlglue.c gmarshal_funcs.c version.c version.c.new
 GEN_H = owl_prototypes.h owl_prototypes.h.new gmarshal_funcs.h
 
@@ -70 +74 @@
 
 # Only copy file into place if file.new is different
-%: %.new
+owl_prototypes.h version.c: %: %.new
         @diff -U0 $@ $< || { \
          test -f $@ && echo '$@ changed!'; \
@@ -87 +91 @@
         $(AM_V_GEN)perl $< $(sort $(filter-out $<,$+)) > $@
 
+version.c.new: Makefile BUILD_VERSION.mk
+        $(AM_V_GEN)echo 'const char *version = "$(VERSION)";' > $@
+
 gmarshal_funcs.h: marshal_types
         glib-genmarshal --header $< > $@
@@ -96 +103 @@
         $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
 
-CLEANFILES = $(BUILT_SOURCES) $(GEN_C) $(noinst_SCRIPTS) $(check_SCRIPTS)
+CLEANFILES = $(BUILT_SOURCES) $(GEN_C) $(noinst_SCRIPTS) $(check_SCRIPTS) BUILD_VERSION.mk
 EXTRA_DIST = \
     autogen.sh \