Browse Source

Add RELEASE file that holds current version.

Georgi Chorbadzhiyski 12 years ago
parent
commit
a3661b39fd
3 changed files with 10 additions and 8 deletions
  1. 8
    7
      Makefile
  2. 1
    0
      RELEASE
  3. 1
    1
      tsdecrypt.c

+ 8
- 7
Makefile View File

@@ -1,15 +1,16 @@
1 1
 CC = $(CROSS)$(TARGET)gcc
2 2
 STRIP = $(CROSS)$(TARGET)strip
3
+
3 4
 BUILD_ID = $(shell date +%F_%R)
4
-VERSION="v3.0"
5
+VERSION = $(shell cat RELEASE)
5 6
 GIT_VER = $(shell git describe --tags --dirty --always 2>/dev/null)
6
-CFLAGS = -ggdb -Wall -Wextra -Wshadow -Wformat-security -Wno-strict-aliasing -O2 -D_GNU_SOURCE -DBUILD_ID=\"$(BUILD_ID)\"
7
-ifneq "$(GIT_VER)" ""
8
-CFLAGS += -DGIT_VER=\"$(GIT_VER)\"
9
-else
10
-CFLAGS += -DGIT_VER=\"$(VERSION)\"
7
+ifeq "$(GIT_VER)" ""
8
+GIT_VER = "release"
11 9
 endif
12 10
 
11
+CFLAGS  = -ggdb -Wall -Wextra -Wshadow -Wformat-security -Wno-strict-aliasing -O2 -D_GNU_SOURCE
12
+CFLAGS += -DBUILD_ID=\"$(BUILD_ID)\" -DVERSION=\"$(VERSION)\" -DGIT_VER=\"$(GIT_VER)\"
13
+
13 14
 RM = /bin/rm -f
14 15
 Q = @
15 16
 
@@ -50,7 +51,7 @@ tsdecrypt: $(tsdecrypt_OBJS)
50 51
 	$(Q)echo "  LINK	tsdecrypt"
51 52
 	$(Q)$(CC) $(CFLAGS) $(tsdecrypt_OBJS) $(tsdecrypt_LIBS) -o tsdecrypt
52 53
 
53
-%.o: %.c data.h
54
+%.o: %.c RELEASE data.h
54 55
 	$(Q)echo "  CC	tsdecrypt	$<"
55 56
 	$(Q)$(CC) $(CFLAGS)  -c $<
56 57
 

+ 1
- 0
RELEASE View File

@@ -0,0 +1 @@
1
+3.0

+ 1
- 1
tsdecrypt.c View File

@@ -34,7 +34,7 @@
34 34
 #define FIRST_REPORT_SEC 3
35 35
 
36 36
 #define PROGRAM_NAME "tsdecrypt"
37
-static const char *program_id = PROGRAM_NAME " " GIT_VER " build " BUILD_ID;
37
+static const char *program_id = PROGRAM_NAME " v" VERSION " (" GIT_VER ", build " BUILD_ID ")";
38 38
 
39 39
 static int keep_running = 1;
40 40
 

Loading…
Cancel
Save