media-libs/libwmf/files/libwmf-0.2.8.4-build.patch


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
51
52
53
54

--- libwmf-0.2.8.4/src/convert/Makefile.am
+++ libwmf-0.2.8.4/src/convert/Makefile.am
@@ -1,6 +1,6 @@
-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
+AM_CFLAGS = @WMF_CFLAGS@
 
-LDFLAGS = -L$(top_builddir)/src/.libs @WMF_LIBFLAGS@ @LDFLAGS@
+LDADD = -L$(top_builddir)/src/.libs @WMF_LIBFLAGS@ @LDFLAGS@
 
 DEFS = @DEFS@ @WMF_DEFS@ \
 	-DPACKAGE=\"@PACKAGE@\" \
--- libwmf-0.2.8.4/src/extra/gd/Makefile.am
+++ libwmf-0.2.8.4/src/extra/gd/Makefile.am
@@ -1,8 +1,6 @@
 INCLUDES = -I$(srcdir)
 
-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
-
-LDFLAGS = @LDFLAGS@
+AM_CFLAGS = @WMF_CFLAGS@
 
 DEFS = @DEFS@ @GD_DEFS@
 
--- libwmf-0.2.8.4/src/extra/trio/Makefile.am
+++ libwmf-0.2.8.4/src/extra/trio/Makefile.am
@@ -1,6 +1,4 @@
-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
-
-LDFLAGS = @LDFLAGS@
+AM_CFLAGS = @WMF_CFLAGS@
 
 DEFS = @DEFS@ @WMF_DEFS@
 
--- libwmf-0.2.8.4/src/ipa/Makefile.am
+++ libwmf-0.2.8.4/src/ipa/Makefile.am
@@ -1,6 +1,4 @@
-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
-
-LDFLAGS = @LDFLAGS@
+AM_CFLAGS = @WMF_CFLAGS@
 
 DEFS = @DEFS@ @WMF_DEFS@ \
 	-DPACKAGE=\"@PACKAGE@\" \
--- libwmf-0.2.8.4/src/Makefile.am
+++ libwmf-0.2.8.4/src/Makefile.am
@@ -20,7 +20,7 @@
 
 SUBDIRS = $(DIRHEAVY)
 
-CFLAGS = @CFLAGS@ @WMF_CFLAGS@ @GDK_PIXBUF_CFLAGS@
+AM_CFLAGS = @WMF_CFLAGS@ @GDK_PIXBUF_CFLAGS@
 
 DEFS = @DEFS@ @WMF_DEFS@ $(DEFHEAVY) $(GDK_PIXBUF_DEFS) \
 	-DPACKAGE=\"@PACKAGE@\" \