Package: derivations / 0.53.20120414-1.2

cxxflags Patch series | download
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
author: Pino Toscano <pino@debian.org>
description: automatically support poppler api changes

--- a/btool/Makefile	2014-01-26 21:56:15.859514804 +0000
+++ b/btool/Makefile	2014-01-26 21:56:15.859514804 +0000
@@ -33,7 +33,7 @@
 allobj: $(allobj)
 $(foreach dir, $(srcdir), $(dir)/%): FORCE; $(MAKE) -C $(@D) $(@F)
 %.d: %.cc; g++ -MM $< | sed -e 's/:/ $*.d:/' >$@
-%.o: %.cc; g++ $(warn) $(optim) -c $< -o $*.o
+%.o: %.cc; g++ $(warn) $(optim) $(CXXFLAGS) -c $< -o $*.o
 
 complete-pdf: complete-pdf.o $(allobj)
 	g++ $(warn) $(optim) $^ -lpoppler -o $@
--- a/btool/Makefile-subdir	2014-01-26 21:56:15.859514804 +0000
+++ b/btool/Makefile-subdir	2014-01-26 21:57:25.843514632 +0000
@@ -2,6 +2,8 @@
 # This makefile is meant to be used only when accessed
 # through a symbolic link from an immediate subdirectory.
 
+CXXFLAGS += $(shell pkg-config --cflags poppler)
+
 warn := -Wall -Wextra
 
 include ../Makefile-optim
@@ -15,7 +17,7 @@
   include $(alld)
 endif
 %.d: %.cc; g++ -MM $< | sed -e 's/:/ $*.d:/' >$@
-%.o:; g++ $(warn) $(optim) -c $< -o $*.o
+%.o:; g++ $(warn) $(optim) $(CXXFLAGS) -c $< -o $*.o
 
 cleanless:
 	rm -fv *.d *.o *.gch a.out