You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/media-gfx/apngopt/files/apngopt-1.4-r1-makefile.patch

44 lines
1.2 KiB

Use system zopfli library and respect CFLAGS.
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
PACKAGE = apngopt
-CC = gcc
-SRC_DIRS = . 7z zopfli
-CFLAGS = -Wall -pedantic
-CFLAGS_OPT = -O2
-CFLAGS_7Z = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
-LIBS = -lstdc++ -lm -lpng -lz
+
+SRC_DIRS = . 7z
+CXXFLAGS += -Wall -pedantic
+CXXFLAGS_7Z = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
+LIBS += -lm -lpng -lz -lzopfli
INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS))
@@ -16,19 +15,16 @@
all : $(PACKAGE)
$(PACKAGE) : objdirs $(OBJECTS)
- $(CC) -o $@ $(OBJECTS) -s $(LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
objdirs :
mkdir -p $(OBJ_DIRS)
obj/%.o : %.cpp
- $(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
-
-obj/%.o : %.c
- $(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< $(INCUDE_DIRS)
obj/%.o : %.cc
- $(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT) $(CFLAGS_7Z)
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< $(INCUDE_DIRS) $(CXXFLAGS_7Z)
.PHONY : clean