version info only in oine file
Stefan Schuermans

Stefan Schuermans commited on 2011-10-16 14:56:18
Showing 6 changed files, with 11 additions and 11 deletions.

... ...
@@ -14,6 +14,7 @@ VERSION_MINOR=6
14 14
 VERSION_REVISION=6
15 15
 VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)
16 16
 
17
+include ../version.mk
17 18
 include ../config/config.mk
18 19
 
19 20
 ifeq ($(BLINKENLIB_CFG_OSX),1)
... ...
@@ -3,6 +3,7 @@
3 3
 added copying rectangular section to BlinkenConv
4 4
 added CopyRect to BlinkenFrame and Movie
5 5
 changed indenting to be more "standard"
6
+changed version info config to be in just one file
6 7
 
7 8
 0.6.6 2011-09-10
8 9
 ----------------
... ...
@@ -3,10 +3,7 @@
3 3
 # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
4 4
 # a blinkenarea.org project
5 5
 
6
-VERSION_MAJOR=0
7
-VERSION_MINOR=6
8
-VERSION_REVISION=7
9
-VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)
6
+include version.mk
10 7
 
11 8
 UPDATE_FILES=Makefile */Makefile */*.c */*.h
12 9
 PACK_FILES=BlinkenLib ChangeLog config examples install Makefile
... ...
@@ -26,12 +26,12 @@ config.cfg: osx.cfg mng.cfg
26 26
 config.mk: config.cfg
27 27
 	sed 's/^\([A-Z]*\)=\([01]\)$$/BLINKENLIB_CFG_\1=\2/' <$< >$@
28 28
 
29
-config.h: config.cfg Makefile ../Makefile
29
+config.h: config.cfg Makefile ../version.mk
30 30
 	sed 's/^\([A-Z]*\)=0$$/#undef BLINKENLIB_CFG_\1/;s/^\([A-Z]*\)=1$$/#define BLINKENLIB_CFG_\1/' <$< >$@
31 31
 	echo '#define BLINKENLIB_CONFIG "' | tr -d '\n' >>$@
32 32
 	sed 's/^\([A-Z]*\)=0$$/\1-/;s/^\([A-Z]*\)=1$$/\1+/' <$< | tr '\n' ' ' | sed 's/ *$$//' | tr -d '\n' >>$@
33 33
 	echo '"' >>$@
34
-	grep '^VERSION_[A-Z]*=[0-9]*' ../Makefile | sed 's/^/#define BLINKENLIB_/;s/=/ /' >>$@
34
+	grep '^VERSION_[A-Z]*=[0-9]*' ../version.mk | sed 's/^/#define BLINKENLIB_/;s/=/ /' >>$@
35 35
 
36 36
 clean:
37 37
 	rm -f *.cfg config.mk config.h
... ...
@@ -5,11 +5,7 @@
5 5
 
6 6
 INSTALL=install
7 7
 
8
-VERSION_MAJOR=0
9
-VERSION_MINOR=6
10
-VERSION_REVISION=6
11
-VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)
12
-
8
+include ../version.mk
13 9
 include ../config/config.mk
14 10
 
15 11
 ifeq ($(BLINKENLIB_CFG_OSX),1)
... ...
@@ -0,0 +1,5 @@
1
+VERSION_MAJOR=0
2
+VERSION_MINOR=6
3
+VERSION_REVISION=7
4
+VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)
5
+
0 6