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
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
Makefile | 8 ++++----
plugins/src/ArjLib/Makefile | 6 +++---
plugins/src/Bz2Lib/Makefile | 6 +++---
plugins/src/GzLib/Makefile | 6 +++---
plugins/src/GzLib/zlib/Makefile | 2 +-
plugins/src/LstLib/Makefile | 6 +++---
plugins/src/TarLib/Makefile | 6 +++---
plugins/src/ZLib/Makefile | 6 +++---
plugins/src/ZipLib/Makefile | 8 ++++----
plugins/src/ZipLib/ZipArchive/Makefile | 2 +-
plugins/src/ZipLib/ZipArchive/zlib/Makefile | 2 +-
11 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Makefile b/Makefile
index 1fe9736..088b587 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ topdir=/usr/src/redhat
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
@@ -31,8 +31,8 @@ HAVE_GNOME_VFS=1
#DEBUG=-g -D_DEBUG
-CXX=g++
-CFLAGS=-Wall
+CXX ?=g++
+CFLAGS+=-Wall
FLAGS=$(CFLAGS)
BIN=./bin
OBJ=./bin
@@ -47,7 +47,7 @@ LOPTIMIZE=-Os -Wl,--as-needed
# 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
diff --git a/plugins/src/ArjLib/Makefile b/plugins/src/ArjLib/Makefile
index c8f4c9c..9d45b10 100644
--- a/plugins/src/ArjLib/Makefile
+++ b/plugins/src/ArjLib/Makefile
@@ -12,12 +12,12 @@
#
#DEBUG=-g
-CXX=gcc
-CFLAGS= -I ../
+CXX ?=g++
+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
#
diff --git a/plugins/src/Bz2Lib/Makefile b/plugins/src/Bz2Lib/Makefile
index 5cccce4..c794912 100644
--- a/plugins/src/Bz2Lib/Makefile
+++ b/plugins/src/Bz2Lib/Makefile
@@ -12,12 +12,12 @@
#
#DEBUG=-g
-CXX=gcc
-CFLAGS= -I ../
+CXX ?=g++
+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
#
diff --git a/plugins/src/GzLib/Makefile b/plugins/src/GzLib/Makefile
index 92d9216..1e8eb28 100644
--- a/plugins/src/GzLib/Makefile
+++ b/plugins/src/GzLib/Makefile
@@ -12,12 +12,12 @@
#
#DEBUG=-g
-CXX=gcc
-CFLAGS= -I ../
+CXX ?=g++
+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
#
diff --git a/plugins/src/GzLib/zlib/Makefile b/plugins/src/GzLib/zlib/Makefile
index 9fe7751..add1461 100644
--- a/plugins/src/GzLib/zlib/Makefile
+++ b/plugins/src/GzLib/zlib/Makefile
@@ -8,7 +8,7 @@
CC=cc
-CFLAGS=-O -fPIC
+CFLAGS+=-O -fPIC
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS=-g -DDEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
diff --git a/plugins/src/LstLib/Makefile b/plugins/src/LstLib/Makefile
index b951beb..ee19c23 100644
--- a/plugins/src/LstLib/Makefile
+++ b/plugins/src/LstLib/Makefile
@@ -12,12 +12,12 @@
#
#DEBUG=-g
-CXX=gcc
-CFLAGS= -I ../
+CXX ?=g++
+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
#
diff --git a/plugins/src/TarLib/Makefile b/plugins/src/TarLib/Makefile
index 7b142d8..425c915 100644
--- a/plugins/src/TarLib/Makefile
+++ b/plugins/src/TarLib/Makefile
@@ -12,12 +12,12 @@
#
#DEBUG=-g
-CXX=gcc
-CFLAGS= -I ../
+CXX ?=g++
+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
#
diff --git a/plugins/src/ZLib/Makefile b/plugins/src/ZLib/Makefile
index ceed8d5..d9751ee 100644
--- a/plugins/src/ZLib/Makefile
+++ b/plugins/src/ZLib/Makefile
@@ -12,12 +12,12 @@
#
#DEBUG=-g
-CXX=gcc
-CFLAGS= -I ../
+CXX ?=g++
+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
#
diff --git a/plugins/src/ZipLib/Makefile b/plugins/src/ZipLib/Makefile
index 0b488ed..82690ed 100644
--- a/plugins/src/ZipLib/Makefile
+++ b/plugins/src/ZipLib/Makefile
@@ -13,16 +13,16 @@
#DEBUG=-g -D_DEBUG
#compiler compatible to ZipArchive!
-#CXX=g++
-CXX=gcc
-CFLAGS= -I../ -I./ZipArchive/stl -I./ZipArchive/Linux -I./ZipArchive/
+#CXX ?=g++
+CXX ?=g++
+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
#
diff --git a/plugins/src/ZipLib/ZipArchive/Makefile b/plugins/src/ZipLib/ZipArchive/Makefile
index 4cf0d3f..49139aa 100644
--- a/plugins/src/ZipLib/ZipArchive/Makefile
+++ b/plugins/src/ZipLib/ZipArchive/Makefile
@@ -11,7 +11,7 @@ CC=g++ -I./stl -I./Linux
CCC=cc
#CFLAGS = -g
-CFLAGS=-fPIC
+CFLAGS+=-fPIC
ZIPARCHLIB = libziparch.a
diff --git a/plugins/src/ZipLib/ZipArchive/zlib/Makefile b/plugins/src/ZipLib/ZipArchive/zlib/Makefile
index dc9b836..04ca23f 100644
--- a/plugins/src/ZipLib/ZipArchive/zlib/Makefile
+++ b/plugins/src/ZipLib/ZipArchive/zlib/Makefile
@@ -8,7 +8,7 @@
CC=cc
-CFLAGS=-O -fPIC
+CFLAGS+=-O -fPIC
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
#CFLAGS=-g -DDEBUG
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
|
GitWeb