From: fred <fred>
Date: Fri, 13 Dec 1996 20:32:48 +0000 (+0000)
Subject: flower-1.0.14
X-Git-Tag: release/1.5.59~6594
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c5ee63c717e718bb6bc713dd85688c23f5666e42;p=lilypond.git

flower-1.0.14
---

diff --git a/flower/Makefile b/flower/Makefile
index 56e0da5e16..89e3bd6f5c 100644
--- a/flower/Makefile
+++ b/flower/Makefile
@@ -1,20 +1,6 @@
-MAJVER=1
-MINVER=0
-PATCHLEVEL=13
+include Variables.make
 
-PACKAGENAME=flower
-VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
-DNAME=$(PACKAGENAME)-$(VERSION)
-DEFINES=-DNDEBUG -O2
-#DEFINES=-g
-CXXFLAGS+=$(DEFINES)  -Wall -W -pedantic
-
-include Sources.make
-
-obs=$(cc:.cc=.o)
-staticlib=libflower.a
-
-$(staticlib): $(obs)
+$(staticlib): $(obs) fversion.hh
 	$(AR) cr libflower.a $(obs)
 
 include depend
@@ -29,8 +15,9 @@ clean:
 realclean: clean
 	rm -f depend
 
-DFILES=$(hh) $(cc) $(inl) $(templatecc) Makefile Sources.make TODO README
-DDIR=$(DNAME)
+fversion.hh: Variables.make make_version
+	make_version $(MAJVER) $(MINVER) $(PATCHLEVEL) "$(CXX) `$(CXXVER)`" > $@
+
 
 dist:
 	-mkdir $(DDIR)
diff --git a/flower/Variables.make b/flower/Variables.make
new file mode 100644
index 0000000000..e0f94d6555
--- /dev/null
+++ b/flower/Variables.make
@@ -0,0 +1,19 @@
+MAJVER=1
+MINVER=0
+PATCHLEVEL=14
+
+PACKAGENAME=flower
+VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
+DNAME=$(PACKAGENAME)-$(VERSION)
+DEFINES=-DNDEBUG -O2
+#DEFINES=-g
+CXXFLAGS+=$(DEFINES)  -Wall -W -pedantic
+CXXVER=$(CXX) --version
+include Sources.make
+
+obs=$(cc:.cc=.o)
+staticlib=libflower.a
+
+DFILES=$(hh) $(cc) $(inl) $(templatecc) Makefile Variables.make make_version\
+	Sources.make TODO README
+DDIR=$(DNAME)