Download as
Browse Code »

Commit 2396c6b3665cb39b3e677184ebfa3498becd036b

Authored by Perry Werneck
1 parent 8cdc248c
Exists in master and in 1 other branch develop

Refactoring build process.

Showing 2 changed files with 46 additions and 82 deletions   Show diff stats
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
26 26
27 #---[ Library configuration ]------------------------------------------------------------ 27 #---[ Library configuration ]------------------------------------------------------------
28 28
  29 +SONAME=@SONAME@
29 LIBNAME=libv@LIB3270_NAME@ 30 LIBNAME=libv@LIB3270_NAME@
30 31
31 SOURCES= \ 32 SOURCES= \
@@ -123,7 +124,7 @@ $(OBJDBG)/%.o: \ @@ -123,7 +124,7 @@ $(OBJDBG)/%.o: \
123 $(DEPENDS) 124 $(DEPENDS)
124 125
125 @echo $< ... 126 @echo $< ...
126 - @$(MKDIR) `dirname $@` 127 + @$(MKDIR) $(dir $@)
127 128
128 @$(CC) \ 129 @$(CC) \
129 $(CFLAGS) \ 130 $(CFLAGS) \
@@ -135,7 +136,7 @@ $(OBJDBG)/%.o: \ @@ -135,7 +136,7 @@ $(OBJDBG)/%.o: \
135 %.rc 136 %.rc
136 137
137 @echo $< ... 138 @echo $< ...
138 - @$(MKDIR) `dirname $@` 139 + @$(MKDIR) $(dir $@)
139 @$(WINDRES) $< -O coff -o $@ 140 @$(WINDRES) $< -O coff -o $@
140 141
141 #---[ Release Rules ]-------------------------------------------------------------------- 142 #---[ Release Rules ]--------------------------------------------------------------------
@@ -145,7 +146,7 @@ $(OBJRLS)/%.o: \ @@ -145,7 +146,7 @@ $(OBJRLS)/%.o: \
145 $(DEPENDS) 146 $(DEPENDS)
146 147
147 @echo $< ... 148 @echo $< ...
148 - @$(MKDIR) `dirname $@` 149 + @$(MKDIR) $(dir $@)
149 @$(CC) \ 150 @$(CC) \
150 $(CFLAGS) \ 151 $(CFLAGS) \
151 -DNDEBUG=1 \ 152 -DNDEBUG=1 \
@@ -155,7 +156,7 @@ $(OBJRLS)/%.o: \ @@ -155,7 +156,7 @@ $(OBJRLS)/%.o: \
155 %.rc 156 %.rc
156 157
157 @echo $< ... 158 @echo $< ...
158 - @$(MKDIR) `dirname $@` 159 + @$(MKDIR) $(dir $@)
159 @$(WINDRES) $< -O coff -o $@ 160 @$(WINDRES) $< -O coff -o $@
160 161
161 #---[ Misc Rules ]----------------------------------------------------------------------- 162 #---[ Misc Rules ]-----------------------------------------------------------------------
@@ -164,7 +165,7 @@ $(POTDIR)/$(LIBNAME)/%.pot: \ @@ -164,7 +165,7 @@ $(POTDIR)/$(LIBNAME)/%.pot: \
164 %.c 165 %.c
165 166
166 @echo $(notdir $@) ... 167 @echo $(notdir $@) ...
167 - @$(MKDIR) `dirname $@` 168 + @$(MKDIR) $(dir $@)
168 @$(XGETTEXT) \ 169 @$(XGETTEXT) \
169 --language=C \ 170 --language=C \
170 --keyword=_ \ 171 --keyword=_ \
@@ -178,7 +179,7 @@ $(POTDIR)/$(LIBNAME)/%.pot: \ @@ -178,7 +179,7 @@ $(POTDIR)/$(LIBNAME)/%.pot: \
178 %.rc 179 %.rc
179 180
180 @echo $< ... 181 @echo $< ...
181 - @$(MKDIR) `dirname $@` 182 + @$(MKDIR) $(dir $@)
182 @touch $@ 183 @touch $@
183 184
184 185
@@ -188,7 +189,7 @@ src/terminal/marshal.h: \ @@ -188,7 +189,7 @@ src/terminal/marshal.h: \
188 src/terminal/marshal 189 src/terminal/marshal
189 190
190 @echo $@ ... 191 @echo $@ ...
191 - @$(MKDIR) `dirname $@` 192 + @$(MKDIR) $(dir $@)
192 193
193 @$(GENMARSHAL) --prefix=v3270 --header $< > $@ 194 @$(GENMARSHAL) --prefix=v3270 --header $< > $@
194 195
@@ -196,7 +197,7 @@ $(OBJDIR)/marshal/v3270.c: \ @@ -196,7 +197,7 @@ $(OBJDIR)/marshal/v3270.c: \
196 src/terminal/marshal 197 src/terminal/marshal
197 198
198 @echo $@ ... 199 @echo $@ ...
199 - @$(MKDIR) `dirname $@` 200 + @$(MKDIR) $(dir $@)
200 201
201 @$(GENMARSHAL) --prefix=v3270 --body $< > $@ 202 @$(GENMARSHAL) --prefix=v3270 --body $< > $@
202 203
@@ -205,7 +206,7 @@ src/filetransfer/marshal.h: \ @@ -205,7 +206,7 @@ src/filetransfer/marshal.h: \
205 src/filetransfer/marshal 206 src/filetransfer/marshal
206 207
207 @echo $@ ... 208 @echo $@ ...
208 - @$(MKDIR) `dirname $@` 209 + @$(MKDIR) $(dir $@)
209 210
210 @$(GENMARSHAL) --prefix=v3270ft --header $< > $@ 211 @$(GENMARSHAL) --prefix=v3270ft --header $< > $@
211 212
@@ -213,7 +214,7 @@ $(OBJDIR)/marshal/v3270ft.c: \ @@ -213,7 +214,7 @@ $(OBJDIR)/marshal/v3270ft.c: \
213 src/filetransfer/marshal 214 src/filetransfer/marshal
214 215
215 @echo $@ ... 216 @echo $@ ...
216 - @$(MKDIR) `dirname $@` 217 + @$(MKDIR) $(dir $@)
217 218
218 @$(GENMARSHAL) --prefix=v3270ft --body $< > $@ 219 @$(GENMARSHAL) --prefix=v3270ft --body $< > $@
219 220
@@ -222,7 +223,7 @@ $(OBJDIR)/marshal/%.o: \ @@ -222,7 +223,7 @@ $(OBJDIR)/marshal/%.o: \
222 $(DEPENDS) 223 $(DEPENDS)
223 224
224 @echo $< ... 225 @echo $< ...
225 - @$(MKDIR) `dirname $@` 226 + @$(MKDIR) $(dir $@)
226 227
227 @$(CC) \ 228 @$(CC) \
228 $(CFLAGS) \ 229 $(CFLAGS) \
@@ -234,51 +235,24 @@ $(OBJDIR)/marshal/%.o: \ @@ -234,51 +235,24 @@ $(OBJDIR)/marshal/%.o: \
234 #---[ Release Targets ]------------------------------------------------------------------ 235 #---[ Release Targets ]------------------------------------------------------------------
235 236
236 all: \ 237 all: \
237 - $(BINRLS)/$(LIBNAME)@DLLEXT@ \ 238 + $(BINRLS)/$(SONAME) \
238 $(BINRLS)/static/$(LIBNAME).a \ 239 $(BINRLS)/static/$(LIBNAME).a \
239 - $(POTDIR)/$(LIBNAME).pot  
240 -  
241 -x: \  
242 - $(BINDIR)/icons/16x16/logo.png \  
243 - $(BINDIR)/icons/22x22/logo.png  
244 -  
245 - 240 + $(POTDIR)/lib3270.pot
246 241
247 Release: \ 242 Release: \
248 - $(BINRLS)/$(LIBNAME)@DLLEXT@ \ 243 + $(BINRLS)/$(SONAME) \
249 $(BINRLS)/static/$(LIBNAME).a 244 $(BINRLS)/static/$(LIBNAME).a
250 245
251 -$(BINRLS)/$(LIBNAME)@DLLEXT@: \  
252 - $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@  
253 -  
254 - @echo $< ...  
255 - @rm -f $@  
256 - @$(LN_S) \  
257 - $^ \  
258 - $@  
259 -  
260 -$(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \  
261 - $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@  
262 -  
263 - @rm -f $@  
264 - @$(LN_S) \  
265 - $^ \  
266 - $@  
267 -  
268 -$(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \  
269 - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \  
270 - $(OBJDIR)/marshal/v3270.o \  
271 - $(OBJDIR)/marshal/v3270ft.o 246 +$(BINRLS)/$(SONAME): \
  247 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
272 248
273 - @$(MKDIR) `dirname $@` 249 + @$(MKDIR) $(dir $@)
274 @echo $< ... 250 @echo $< ...
275 @$(LD) \ 251 @$(LD) \
276 @DLL_LDFLAGS@ \ 252 @DLL_LDFLAGS@ \
277 -o $@ \ 253 -o $@ \
278 $(LDFLAGS) \ 254 $(LDFLAGS) \
279 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ 255 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \
280 - $(OBJDIR)/marshal/v3270.o \  
281 - $(OBJDIR)/marshal/v3270ft.o \  
282 -L$(BINRLS) \ 256 -L$(BINRLS) \
283 $(LIBS) 257 $(LIBS)
284 258
@@ -286,7 +260,7 @@ $(BINRLS)/static/$(LIBNAME).a: \ @@ -286,7 +260,7 @@ $(BINRLS)/static/$(LIBNAME).a: \
286 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) 260 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
287 261
288 @echo $@ ... 262 @echo $@ ...
289 - @$(MKDIR) `dirname $@` 263 + @$(MKDIR) $(dir $@)
290 @$(AR) rcs $@ $^ 264 @$(AR) rcs $@ $^
291 265
292 266
@@ -299,15 +273,14 @@ install: \ @@ -299,15 +273,14 @@ install: \
299 install-dev 273 install-dev
300 274
301 install-shared: \ 275 install-shared: \
302 - $(BINRLS)/$(LIBNAME)@DLLEXT@ 276 + $(BINRLS)/$(SONAME)
303 277
304 # Install library 278 # Install library
305 - @mkdir -p $(DESTDIR)$(libdir) 279 + @$(MKDIR) $(DESTDIR)$(libdir)
306 280
307 @$(INSTALL_PROGRAM) \ 281 @$(INSTALL_PROGRAM) \
308 - $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \  
309 - $(DESTDIR)$(libdir)  
310 - 282 + $(BINRLS)/$(SONAME) \
  283 + $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
311 284
312 @$(LN_S) \ 285 @$(LN_S) \
313 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ 286 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
@@ -317,6 +290,7 @@ install-shared: \ @@ -317,6 +290,7 @@ install-shared: \
317 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 290 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
318 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ 291 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
319 292
  293 +
320 # Install default configs 294 # Install default configs
321 @mkdir -p $(DESTDIR)$(datarootdir)/pw3270 295 @mkdir -p $(DESTDIR)$(datarootdir)/pw3270
322 296
@@ -389,7 +363,7 @@ Debug: \ @@ -389,7 +363,7 @@ Debug: \
389 363
390 $(BINDBG)/$(LIBNAME)@EXEEXT@: \ 364 $(BINDBG)/$(LIBNAME)@EXEEXT@: \
391 $(foreach SRC, $(basename $(TEST_SOURCES)), $(OBJDBG)/$(SRC).o) \ 365 $(foreach SRC, $(basename $(TEST_SOURCES)), $(OBJDBG)/$(SRC).o) \
392 - $(BINDBG)/$(LIBNAME)@DLLEXT@ 366 + $(BINDBG)/$(SONAME)
393 367
394 @$(MKDIR) `dirname $@` 368 @$(MKDIR) `dirname $@`
395 @echo $< ... 369 @echo $< ...
@@ -399,9 +373,8 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ @@ -399,9 +373,8 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
399 -L$(BINDBG) \ 373 -L$(BINDBG) \
400 -Wl,-rpath,$(BINDBG) \ 374 -Wl,-rpath,$(BINDBG) \
401 $(LDFLAGS) \ 375 $(LDFLAGS) \
402 - $(LIBS) \  
403 - -lv@LIB3270_NAME@  
404 - 376 + $(LIBS)
  377 +
405 run: \ 378 run: \
406 $(BINDBG)/$(LIBNAME)@EXEEXT@ 379 $(BINDBG)/$(LIBNAME)@EXEEXT@
407 380
@@ -425,24 +398,7 @@ else @@ -425,24 +398,7 @@ else
425 endif 398 endif
426 399
427 400
428 -$(BINDBG)/$(LIBNAME)@DLLEXT@: \  
429 - $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@  
430 -  
431 - @echo $< ...  
432 - @rm -f $@  
433 - @$(LN_S) \  
434 - $^ \  
435 - $@  
436 -  
437 -$(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \  
438 - $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@  
439 -  
440 - @rm -f $@  
441 - @$(LN_S) \  
442 - $^ \  
443 - $@  
444 -  
445 -$(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 401 +$(BINDBG)/$(SONAME): \
446 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \ 402 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \
447 $(OBJDIR)/marshal/v3270.o \ 403 $(OBJDIR)/marshal/v3270.o \
448 $(OBJDIR)/marshal/v3270ft.o 404 $(OBJDIR)/marshal/v3270ft.o
@@ -459,15 +415,6 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -459,15 +415,6 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
459 $(OBJDIR)/marshal/v3270ft.o \ 415 $(OBJDIR)/marshal/v3270ft.o \
460 $(LIBS) 416 $(LIBS)
461 417
462 -zip-debug: \  
463 - $(LIBNAME)-debug-@PACKAGE_VERSION@-@host_cpu@.zip  
464 -  
465 -$(LIBNAME)-debug-@PACKAGE_VERSION@-@host_cpu@.zip: \  
466 - $(BINDBG)/$(LIBNAME)@EXEEXT@ \  
467 - $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@  
468 -  
469 - @$(ZIP) -9 -j $@ $^  
470 -  
471 418
472 #---[ Clean Targets ]-------------------------------------------------------------------- 419 #---[ Clean Targets ]--------------------------------------------------------------------
473 420
@@ -115,6 +115,7 @@ case &quot;$host&quot; in @@ -115,6 +115,7 @@ case &quot;$host&quot; in
115 115
116 esac 116 esac
117 117
  118 +
118 AC_SUBST(DATADIR,$app_cv_datadir) 119 AC_SUBST(DATADIR,$app_cv_datadir)
119 AC_SUBST(CONFDIR,$app_cv_confdir) 120 AC_SUBST(CONFDIR,$app_cv_confdir)
120 AC_SUBST(OSNAME,$app_cv_osname) 121 AC_SUBST(OSNAME,$app_cv_osname)
@@ -284,11 +285,27 @@ dnl --------------------------------------------------------------------------- @@ -284,11 +285,27 @@ dnl ---------------------------------------------------------------------------
284 dnl Lib3270 flags 285 dnl Lib3270 flags
285 dnl --------------------------------------------------------------------------- 286 dnl ---------------------------------------------------------------------------
286 287
  288 +
287 AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ]) 289 AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ])
288 290
289 AC_DEFINE(LIB3270_NAME,$app_cv_libname) 291 AC_DEFINE(LIB3270_NAME,$app_cv_libname)
290 AC_SUBST(LIB3270_NAME,$app_cv_libname) 292 AC_SUBST(LIB3270_NAME,$app_cv_libname)
291 293
  294 +
  295 +case "$host" in
  296 + *-mingw32|*-pc-msys)
  297 + AC_SUBST(SONAME,libv$app_cv_libname.dll)
  298 + ;;
  299 +
  300 + s390x-*)
  301 + AC_SUBST(SONAME,libv$app_cv_libname.so)
  302 + ;;
  303 +
  304 + *)
  305 + AC_SUBST(SONAME,libv$app_cv_libname.so.$app_vrs_major.$app_vrs_minor)
  306 +
  307 +esac
  308 +
292 AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library version for SDK])], [ app_cv_sdkversion="$withval" ],[ app_cv_sdkversion=$VERSION ]) 309 AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library version for SDK])], [ app_cv_sdkversion="$withval" ],[ app_cv_sdkversion=$VERSION ])
293 310
294 AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion) 311 AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion)
@@ -309,7 +326,7 @@ AC_ARG_WITH([inet-ntop], [AS_HELP_STRING([--with-inet-ntop], [Assume that inet_n @@ -309,7 +326,7 @@ AC_ARG_WITH([inet-ntop], [AS_HELP_STRING([--with-inet-ntop], [Assume that inet_n
309 if test "$app_cv_inet_ntop" == "auto"; then 326 if test "$app_cv_inet_ntop" == "auto"; then
310 327
311 case "$host" in 328 case "$host" in
312 - *-mingw32) 329 + *-mingw32|*-pc-msys)
313 app_cv_inet_ntop="yes" 330 app_cv_inet_ntop="yes"
314 ;; 331 ;;
315 332