]>
Commit | Line | Data |
---|---|---|
b8dfecef JR |
1 | --- tsdecrypt-3.0/libfuncs/Makefile~ 2011-09-15 15:57:44.000000000 +0200 |
2 | +++ tsdecrypt-3.0/libfuncs/Makefile 2021-09-26 15:45:44.094156123 +0200 | |
3 | @@ -1,9 +1,8 @@ | |
4 | CC = $(CROSS)$(TARGET)gcc | |
5 | LINK = $(CROSS)$(TARGET)ld -o | |
6 | LIBRARY_LINK_OPTS = -L. -r | |
7 | -CFLAGS = -ggdb -Wall -Wextra -Wshadow -Wformat-security -O2 | |
8 | +CFLAGS = -ggdb -Wall -Wextra -Wshadow -Wformat-security -O2 $(OPTFLAGS) | |
9 | RM = /bin/rm -f | |
10 | -Q=@ | |
11 | ||
12 | OBJS = queue.o list.o cbuf.o io.o log.o http_response.o asyncdns.o server.o misc.o | |
13 | PROG = libfuncs.a | |
14 | --- tsdecrypt-3.0/libtsfuncs/Makefile~ 2011-09-15 13:20:24.000000000 +0200 | |
15 | +++ tsdecrypt-3.0/libtsfuncs/Makefile 2021-09-26 15:46:08.340878316 +0200 | |
16 | @@ -1,9 +1,8 @@ | |
17 | CC = $(CROSS)$(TARGET)gcc | |
18 | LINK = $(CROSS)$(TARGET)ld -o | |
19 | LIBRARY_LINK_OPTS = -L. -r | |
20 | -CFLAGS = -ggdb -D_GNU_SOURCE -Wall -Wextra -Wshadow -Wformat-security -O2 | |
21 | +CFLAGS = -ggdb -D_GNU_SOURCE -Wall -Wextra -Wshadow -Wformat-security -O2 $(OPTFLAGS) | |
22 | RM = /bin/rm -f | |
23 | -Q=@ | |
24 | ||
25 | OBJS = log.o tsfuncs.o crc.o misc.o time.o \ | |
26 | sections.o secdata.o \ | |
27 | --- tsdecrypt-3.0/Makefile~ 2011-09-30 12:40:01.000000000 +0200 | |
28 | +++ tsdecrypt-3.0/Makefile 2021-09-26 15:46:39.150948964 +0200 | |
29 | @@ -1,9 +1,8 @@ | |
30 | CC = $(CROSS)$(TARGET)gcc | |
31 | -STRIP = $(CROSS)$(TARGET)strip | |
32 | BUILD_ID = $(shell date +%F_%R) | |
33 | VERSION="v3.0" | |
34 | GIT_VER = $(shell git describe --tags --dirty --always 2>/dev/null) | |
35 | -CFLAGS = -ggdb -Wall -Wextra -Wshadow -Wformat-security -Wno-strict-aliasing -O2 -D_GNU_SOURCE -DBUILD_ID=\"$(BUILD_ID)\" | |
36 | +CFLAGS = -ggdb -Wall -Wextra -Wshadow -Wformat-security -Wno-strict-aliasing -O2 -D_GNU_SOURCE -DBUILD_ID=\"$(BUILD_ID)\" $(OPTFLAGS) | |
37 | ifneq "$(GIT_VER)" "" | |
38 | CFLAGS += -DGIT_VER=\"$(GIT_VER)\" | |
39 | else | |
40 | @@ -11,7 +11,6 @@ | |
41 | endif | |
42 | ||
43 | RM = /bin/rm -f | |
44 | -Q = @ | |
45 | ||
46 | PREFIX ?= /usr/local | |
47 | ||
48 | @@ -39,11 +39,11 @@ | |
49 | ||
50 | $(FUNCS_LIB): | |
51 | $(Q)echo " MAKE $(FUNCS_LIB)" | |
52 | - $(Q)$(MAKE) -s -C $(FUNCS_DIR) | |
53 | + $(Q)$(MAKE) -C $(FUNCS_DIR) | |
54 | ||
55 | $(TS_LIB): | |
56 | $(Q)echo " MAKE $(TS_LIB)" | |
57 | - $(Q)$(MAKE) -s -C $(TS_DIR) | |
58 | + $(Q)$(MAKE) -C $(TS_DIR) | |
59 | ||
60 | tsdecrypt: $(tsdecrypt_OBJS) | |
61 | $(Q)echo " LINK tsdecrypt" | |
62 | @@ -53,10 +52,6 @@ | |
63 | $(Q)echo " CC tsdecrypt $<" | |
64 | $(Q)$(CC) $(CFLAGS) -c $< | |
65 | ||
66 | -strip: | |
67 | - $(Q)echo " STRIP $(PROGS)" | |
68 | - $(Q)$(STRIP) $(PROGS) | |
69 | - | |
70 | clean: | |
71 | $(Q)echo " RM $(CLEAN_OBJS)" | |
72 | $(Q)$(RM) $(CLEAN_OBJS) | |
73 | @@ -62,10 +62,10 @@ | |
74 | $(Q)$(RM) $(CLEAN_OBJS) | |
75 | ||
76 | distclean: clean | |
77 | - $(Q)$(MAKE) -s -C $(TS_DIR) clean | |
78 | - $(Q)$(MAKE) -s -C $(FUNCS_DIR) clean | |
79 | + $(Q)$(MAKE) -C $(TS_DIR) clean | |
80 | + $(Q)$(MAKE) -C $(FUNCS_DIR) clean | |
81 | ||
82 | -install: all strip | |
83 | +install: all | |
84 | @install -d "$(INSTALL_PRG_DIR)" | |
85 | @install -d "$(INSTALL_DOC_DIR)" | |
86 | @echo "INSTALL $(INSTALL_PRG) -> $(INSTALL_PRG_DIR)" |