File: 0003-update-Makefile.patch

package info (click to toggle)
apngopt 1.4-4
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 2,688 kB
  • sloc: ansic: 33,887; cpp: 6,318; makefile: 40
file content (50 lines) | stat: -rw-r--r-- 1,615 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
Description: update Makefile for Hardening and use system library zopfli
Author: xiao sheng wen <atzlinux@sina.com>
Forwarded: not-needed
Last-Update: 2022-07-07

---

--- apngopt-1.4.orig/Makefile
+++ apngopt-1.4/Makefile
@@ -1,12 +1,14 @@
 PACKAGE    = apngopt
 CC         = gcc
-SRC_DIRS   = . 7z zopfli
-CFLAGS     = -Wall -pedantic
+SRC_DIRS   = . 7z
+CFLAGS     = -Wall -pedantic -DFEATURE_7ZIP -DFEATURE_ZOPFLI -g -fstack-protector-strong
 CFLAGS_OPT = -O2
 CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
 LIBS       = -lstdc++ -lm -lpng -lz
+LIBS       += -lzopfli
 
 INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
+INCUDE_DIRS += -Izopfli
 OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS))
 OBJECTS := $(addprefix obj/, $(wildcard $(addsuffix /*.c*, $(SRC_DIRS))))
 OBJECTS := $(OBJECTS:.c=.o)
@@ -16,19 +17,19 @@ OBJECTS := $(OBJECTS:.cpp=.o)
 all : $(PACKAGE)
 
 $(PACKAGE) : objdirs $(OBJECTS)
-	$(CC) -o $@ $(OBJECTS) -s $(LIBS)
+	$(CC) -o $@ $(OBJECTS) -s $(LIBS) $(LDFLAGS)
 
 objdirs :
 	mkdir -p $(OBJ_DIRS)
 
 obj/%.o : %.cpp
-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
+	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $(LDFLAGS) $(CFLAGS_OPT)
 
 obj/%.o : %.c
-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
+	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $(LDFLAGS) $(CFLAGS_OPT)
 
 obj/%.o : %.cc
-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT) $(CFLAGS_7Z)
+	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $(LDFLAGS) $(CFLAGS_OPT) $(CFLAGS_7Z)
 
 .PHONY : clean