Skip to content

Commit

Permalink
Make the version file both a C header file and a Makefile
Browse files Browse the repository at this point in the history
This allows to -include version instead of -DVERSION=... on CC command line.
  • Loading branch information
glandium committed Mar 25, 2012
1 parent 51e7231 commit 9810fc4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
7 changes: 6 additions & 1 deletion GNUmakefile
Expand Up @@ -75,8 +75,13 @@ all: $(BUILD_PROGRAMS) $(wildcard .gitignore) test.img

ALL_MAKEFILES = $(filter-out config.cache,$(MAKEFILE_LIST)) configure.mk

version: VERSION := $(GEN_VERSION)
version: $(filter-out version, $(ALL_MAKEFILES)) $(SRC) $(HEADERS) $(wildcard .git/logs/HEAD .git/refs/tags)
echo VERSION := $(GEN_VERSION) > $@
echo "#if 1" > $@
echo "#define VERSION \"$(VERSION)\"" >> $@
echo "#else" >> $@
echo VERSION := $(VERSION) >> $@
echo "#endif" >> $@

$(BUILD_LIBS):
ar -r $@ $^
Expand Down
2 changes: 1 addition & 1 deletion debugvmfs/manifest.mk
@@ -1,3 +1,3 @@
LDFLAGS := $(DLOPEN_LDFLAGS)
debugvmfs.o_CFLAGS := -DVERSION=\"$(VERSION)\"
debugvmfs.o_CFLAGS := -include version
REQUIRES := libvmfs libreadcmd
2 changes: 1 addition & 1 deletion fsck.vmfs/manifest.mk
@@ -1,2 +1,2 @@
vmfs_fsck.o_CFLAGS := -DVERSION=\"$(VERSION)\"
vmfs_fsck.o_CFLAGS := -include version
REQUIRES := libvmfs
2 changes: 1 addition & 1 deletion vmfs-lvm/manifest.mk
@@ -1,3 +1,3 @@
LDFLAGS := $(DLOPEN_LDFLAGS)
vmfs-lvm.o_CFLAGS := -DVERSION=\"$(VERSION)\"
vmfs-lvm.o_CFLAGS := -include version
REQUIRES := libvmfs libreadcmd

0 comments on commit 9810fc4

Please sign in to comment.