]>
Commit | Line | Data |
---|---|---|
58d32a9b JB |
1 | --- gnome-commander-1.10.2/libgcmd/Makefile.am.orig 2019-11-28 18:39:39.931001008 +0100 |
2 | +++ gnome-commander-1.10.2/libgcmd/Makefile.am 2019-11-28 18:53:32.773155781 +0100 | |
3 | @@ -6,6 +6,8 @@ | |
49318e58 | 4 | AM_CPPFLAGS = \ |
49318e58 | 5 | $(GNOMEUI_CFLAGS) \ |
58d32a9b | 6 | $(GNOMEVFS_CFLAGS) \ |
49318e58 | 7 | + $(GNOME_CFLAGS) \ |
58d32a9b JB |
8 | + $(GTK_CFLAGS) \ |
9 | -DGTK_DISABLE_SINGLE_INCLUDES \ | |
10 | -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES | |
49318e58 | 11 | |
58d32a9b JB |
12 | --- gnome-commander-1.10.2/src/Makefile.am.orig 2019-04-13 12:03:20.000000000 +0200 |
13 | +++ gnome-commander-1.10.2/src/Makefile.am 2019-11-28 18:59:10.237994244 +0100 | |
14 | @@ -14,6 +14,7 @@ | |
15 | $(GNOME_KEYRING_CFLAGS) \ | |
16 | $(UNIQUE_CFLAGS) \ | |
134a9947 | 17 | $(PYTHON_CFLAGS) \ |
18 | + $(IPTCDATA_CFLAGS) \ | |
58d32a9b JB |
19 | -DGTK_DISABLE_SINGLE_INCLUDES \ |
20 | -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \ | |
134a9947 | 21 | -DDATADIR=\""$(datadir)"\"\ |
58d32a9b | 22 | @@ -107,7 +108,8 @@ |
134a9947 | 23 | $(GSF_LIBS) \ |
24 | $(POPPLER_LIBS) \ | |
25 | $(PYTHON_LIBS) \ | |
26 | - $(PYTHON_EXTRA_LIBS) | |
27 | + $(PYTHON_EXTRA_LIBS) \ | |
28 | + $(IPTCDATA_LIBS) | |
29 | ||
58d32a9b JB |
30 | CLEANFILES = \ |
31 | gnome-cmd-advrename-lexer.cc | |
32 | --- gnome-commander-1.10.2/libgcmd/Makefile.am.orig 2019-11-28 19:07:07.498742034 +0100 | |
33 | +++ gnome-commander-1.10.2/libgcmd/Makefile.am 2019-11-28 19:22:31.153738166 +0100 | |
34 | @@ -1,6 +1,6 @@ | |
35 | ## Process this file with automake to produce Makefile.in | |
36 | ||
37 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Werror=cast-function-type -Wno-cast-function-type | |
38 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses | |
39 | AM_LDFLAGS = $(WARN_LDFLAGS) | |
40 | ||
41 | AM_CPPFLAGS = \ | |
42 | --- gnome-commander-1.10.2/src/Makefile.am.orig 2019-11-28 19:07:07.498742034 +0100 | |
43 | +++ gnome-commander-1.10.2/src/Makefile.am 2019-11-28 19:21:37.357362939 +0100 | |
44 | @@ -3,8 +3,7 @@ | |
45 | SUBDIRS = dialogs tags intviewer | |
46 | ||
47 | AM_CXXFLAGS = $(WARN_CXXFLAGS) -Wno-error=switch-default -Wno-switch-default \ | |
48 | - -Werror=parentheses -Wno-parentheses \ | |
49 | - -Werror=cast-function-type -Wno-cast-function-type | |
50 | + -Werror=parentheses -Wno-parentheses | |
51 | AM_LDFLAGS = $(WARN_LDFLAGS) | |
52 | ||
53 | AM_CPPFLAGS = \ | |
54 | --- gnome-commander-1.10.2/src/dialogs/Makefile.am.orig 2019-02-27 20:06:31.000000000 +0100 | |
55 | +++ gnome-commander-1.10.2/src/dialogs/Makefile.am 2019-11-28 19:50:07.528098149 +0100 | |
56 | @@ -2,8 +2,7 @@ | |
57 | ||
58 | noinst_LIBRARIES = libgcmd-dialogs.a | |
59 | ||
60 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \ | |
61 | - -Werror=cast-function-type -Wno-cast-function-type | |
62 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses | |
63 | AM_LDFLAGS = $(WARN_LDFLAGS) | |
64 | ||
65 | AM_CPPFLAGS = \ | |
66 | --- gnome-commander-1.10.2/src/tags/Makefile.am.orig 2019-02-27 20:06:31.000000000 +0100 | |
67 | +++ gnome-commander-1.10.2/src/tags/Makefile.am 2019-11-28 19:52:00.240820866 +0100 | |
68 | @@ -2,8 +2,7 @@ | |
69 | ||
70 | noinst_LIBRARIES = libgcmd-tags.a | |
71 | ||
72 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \ | |
73 | - -Werror=cast-function-type -Wno-cast-function-type | |
74 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses | |
75 | AM_LDFLAGS = $(WARN_LDFLAGS) | |
76 | ||
77 | AM_CPPFLAGS = \ | |
78 | --- gnome-commander-1.10.2/src/intviewer/Makefile.am.orig 2019-02-27 20:06:31.000000000 +0100 | |
79 | +++ gnome-commander-1.10.2/src/intviewer/Makefile.am 2019-11-28 19:55:11.363118801 +0100 | |
80 | @@ -1,7 +1,6 @@ | |
81 | ## Process this file with automake to produce Makefile.in | |
82 | ||
83 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \ | |
84 | - -Werror=cast-function-type -Wno-cast-function-type | |
85 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses | |
86 | AM_LDFLAGS = $(WARN_LDFLAGS) | |
87 | ||
88 | AM_CPPFLAGS = \ | |
89 | --- gnome-commander-1.10.2/plugins/test/Makefile.am.orig 2019-02-27 20:06:31.000000000 +0100 | |
90 | +++ gnome-commander-1.10.2/plugins/test/Makefile.am 2019-11-28 20:26:12.119704884 +0100 | |
91 | @@ -1,6 +1,6 @@ | |
92 | ## Process this file with automake to produce Makefile.in | |
93 | ||
94 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Werror=cast-function-type -Wno-cast-function-type | |
95 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses | |
96 | AM_LDFLAGS = $(WARN_LDFLAGS) | |
97 | ||
98 | AM_CPPFLAGS = \ | |
99 | --- gnome-commander-1.10.2/plugins/fileroller/Makefile.am.orig 2019-02-27 20:06:31.000000000 +0100 | |
100 | +++ gnome-commander-1.10.2/plugins/fileroller/Makefile.am 2019-11-28 20:36:44.592945150 +0100 | |
101 | @@ -1,6 +1,6 @@ | |
102 | ## Process this file with automake to produce Makefile.in | |
103 | ||
104 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Werror=cast-function-type -Wno-cast-function-type | |
105 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses | |
106 | AM_LDFLAGS = $(WARN_LDFLAGS) | |
107 | ||
108 | AM_CPPFLAGS = \ |