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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
--- Makefile.old 2006-12-27 20:03:49.000000000 +0100
+++ Makefile 2006-12-27 20:06:00.000000000 +0100
@@ -15,7 +15,7 @@
archive=atol-$(VERSION)_src
#define plugin install path
-plugin_dir=$(DESTDIR)$(prefix)/local/lib/atol
+plugin_dir=$(DESTDIR)$(prefix)/lib/atol
#comment this to remove gnome-vfs support
HAVE_GNOME_VFS=1
@@ -32,7 +32,7 @@
#DEBUG=-g -D_DEBUG
CXX=g++
-CFLAGS=-Wall
+CFLAGS+=-Wall
FLAGS=$(CFLAGS)
BIN=./bin
OBJ=./bin
@@ -47,7 +47,7 @@
# define compile/link command line with flags
CC=$(QC) $(CXX) $(DEBUG) $(PROFILE) -pthread -DENABLE_NLS
-LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) -ldl -export-dynamic -pthread $(LOPTIMIZE)
+LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) -ldl -export-dynamic -pthread
LIBS=gtk+-2.0 gdk-2.0 glib-2.0 gthread-2.0 libssl
ifdef HAVE_GNOME_VFS
--- plugins/src/ArjLib/Makefile.old 2006-12-27 20:42:47.000000000 +0100
+++ plugins/src/ArjLib/Makefile 2006-12-27 20:48:51.000000000 +0100
@@ -13,11 +13,11 @@
#DEBUG=-g
CXX=gcc
-CFLAGS= -I ../
+CFLAGS+= -I ../
FLAGS= $(CFLAGS)
# define compile/link command line with flags
-CC=$(CXX) $(DEBUG) -fPIC -O2 -MMD -pthread -Wall -D_REENTRANT
+CC=$(CXX) $(DEBUG) -fPIC -pthread -Wall -D_REENTRANT
LD=$(CXX) $(DEBUG) -fPIC
#
--- plugins/src/Bz2Lib/Makefile.old 2006-12-27 20:43:02.000000000 +0100
+++ plugins/src/Bz2Lib/Makefile 2006-12-27 20:49:11.000000000 +0100
@@ -13,11 +13,11 @@
#DEBUG=-g
CXX=gcc
-CFLAGS= -I ../
+CFLAGS+= -I ../
FLAGS= $(CFLAGS)
# define compile/link command line with flags
-CC=$(CXX) $(DEBUG) -fPIC -O2 -MMD -pthread -Wall -D_REENTRANT
+CC=$(CXX) $(DEBUG) -fPIC -pthread -Wall -D_REENTRANT
LD=$(CXX) $(DEBUG) -fPIC
#
--- plugins/src/GzLib/Makefile.old 2006-12-27 20:43:12.000000000 +0100
+++ plugins/src/GzLib/Makefile 2006-12-27 20:49:27.000000000 +0100
@@ -13,11 +13,11 @@
#DEBUG=-g
CXX=gcc
-CFLAGS= -I ../
+CFLAGS+= -I ../
FLAGS= $(CFLAGS)
# define compile/link command line with flags
-CC=$(CXX) $(DEBUG) -fPIC -O2 -MMD -pthread -Wall -D_REENTRANT
+CC=$(CXX) $(DEBUG) -fPIC -pthread -Wall -D_REENTRANT
LD=$(CXX) $(DEBUG) -fPIC
#
--- plugins/src/LstLib/Makefile.old 2006-12-27 20:43:18.000000000 +0100
+++ plugins/src/LstLib/Makefile 2006-12-27 20:49:44.000000000 +0100
@@ -13,11 +13,11 @@
#DEBUG=-g
CXX=gcc
-CFLAGS= -I ../
+CFLAGS+= -I ../
FLAGS= $(CFLAGS)
# define compile/link command line with flags
-CC=$(CXX) $(DEBUG) -fPIC -O2 -MMD -pthread -Wall -D_REENTRANT
+CC=$(CXX) $(DEBUG) -fPIC -pthread -Wall -D_REENTRANT
LD=$(CXX) $(DEBUG) -fPIC
#
--- plugins/src/TarLib/Makefile.old 2006-12-27 20:44:04.000000000 +0100
+++ plugins/src/TarLib/Makefile 2006-12-27 20:50:16.000000000 +0100
@@ -13,11 +13,11 @@
#DEBUG=-g
CXX=gcc
-CFLAGS= -I ../
+CFLAGS+= -I ../
FLAGS= $(CFLAGS)
# define compile/link command line with flags
-CC=$(CXX) $(DEBUG) -fPIC -O2 -MMD -pthread -Wall -D_REENTRANT
+CC=$(CXX) $(DEBUG) -fPIC -pthread -Wall -D_REENTRANT
LD=$(CXX) $(DEBUG) -fPIC
#
--- plugins/src/ZLib/Makefile.old 2006-12-27 20:44:15.000000000 +0100
+++ plugins/src/ZLib/Makefile 2006-12-27 20:50:31.000000000 +0100
@@ -13,11 +13,11 @@
#DEBUG=-g
CXX=gcc
-CFLAGS= -I ../
+CFLAGS+= -I ../
FLAGS= $(CFLAGS)
# define compile/link command line with flags
-CC=$(CXX) $(DEBUG) -fPIC -O2 -MMD -pthread -Wall -D_REENTRANT
+CC=$(CXX) $(DEBUG) -fPIC -pthread -Wall -D_REENTRANT
LD=$(CXX) $(DEBUG) -fPIC
#
--- plugins/src/ZipLib/Makefile.old 2006-12-27 20:08:32.000000000 +0100
+++ plugins/src/ZipLib/Makefile 2006-12-27 20:08:54.000000000 +0100
@@ -15,14 +15,14 @@
#compiler compatible to ZipArchive!
#CXX=g++
CXX=gcc
-CFLAGS= -I../ -I./ZipArchive/stl -I./ZipArchive/Linux -I./ZipArchive/
+CFLAGS+= -I../ -I./ZipArchive/stl -I./ZipArchive/Linux -I./ZipArchive/
FLAGS= $(CFLAGS)
vpath %.h ./ZipArchive/stl:./ZipArchive/Linux
vpath %.cpp ./ZipArchive/stl:./ZipArchive/Linux
# define compile/link command line with flags
-CC=$(CXX) $(DEBUG) -fPIC -O2 -MMD -pthread -Wall -D_REENTRANT
+CC=$(CXX) $(DEBUG) -fPIC -pthread -Wall -D_REENTRANT
LD=$(CXX) $(DEBUG) -fPIC
#
--- plugins/src/ZipLib/ZipArchive/Makefile.old 2006-12-27 21:28:56.000000000 +0100
+++ plugins/src/ZipLib/ZipArchive/Makefile 2006-12-27 21:29:20.000000000 +0100
@@ -11,7 +11,7 @@
CCC=cc
#CFLAGS = -g
-CFLAGS=-fPIC
+CFLAGS+=-fPIC
ZIPARCHLIB = libziparch.a
--- plugins/src/ZipLib/ZipArchive/zlib/Makefile.old 2006-12-27 21:30:55.000000000 +0100
+++ plugins/src/ZipLib/ZipArchive/zlib/Makefile 2006-12-27 21:31:24.000000000 +0100
@@ -8,7 +8,7 @@
CC=cc
-CFLAGS=-O -fPIC
+CFLAGS+=-fPIC
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS=-g -DDEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
--- plugins/src/GzLib/zlib/Makefile.old 2006-12-27 21:32:44.000000000 +0100
+++ plugins/src/GzLib/zlib/Makefile 2006-12-27 21:33:15.000000000 +0100
@@ -8,7 +8,7 @@
CC=cc
-CFLAGS=-O -fPIC
+CFLAGS+=-fPIC
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS=-g -DDEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
|
GitWeb