Download as
Browse Code »

Commit 6196895e8b8c1eb1c2b831e827e470fb2e5a7ffa

Authored by Perry Werneck
1 parent d54fb7ab
Exists in master and in 3 other branches develop, macos, network_module

Refactoring build process.

Showing 2 changed files with 41 additions and 70 deletions   Show diff stats
Makefile.in
  Diff comments   View file @6196895
... ... @@ -26,6 +26,7 @@
26 26  
27 27 #---[ Library configuration ]------------------------------------------------------------
28 28  
  29 +SONAME=@SONAME@
29 30 LIBNAME=lib@LIB3270_NAME@
30 31 INSTALL_PACKAGES=@INSTALL_PACKAGES@
31 32  
... ... @@ -120,7 +121,7 @@ $(OBJDBG)/%.o: \
120 121 $(DEPENDS)
121 122  
122 123 @echo $< ...
123   - @$(MKDIR) `dirname $@`
  124 + @$(MKDIR) $(dir $@)
124 125  
125 126 @$(CC) \
126 127 $(CFLAGS) \
... ... @@ -132,7 +133,7 @@ $(OBJDBG)/%.o: \
132 133 %.rc
133 134  
134 135 @echo $< ...
135   - @$(MKDIR) `dirname $@`
  136 + @$(MKDIR) $(dir $@)
136 137 @$(WINDRES) $< -O coff -o $@
137 138  
138 139 #---[ Release Rules ]--------------------------------------------------------------------
... ... @@ -142,7 +143,7 @@ $(OBJRLS)/%.o: \
142 143 $(DEPENDS)
143 144  
144 145 @echo $< ...
145   - @$(MKDIR) `dirname $@`
  146 + @$(MKDIR) $(dir $@)
146 147 @$(CC) \
147 148 $(CFLAGS) \
148 149 -DNDEBUG=1 \
... ... @@ -152,7 +153,7 @@ $(OBJRLS)/%.o: \
152 153 %.rc
153 154  
154 155 @echo $< ...
155   - @$(MKDIR) `dirname $@`
  156 + @$(MKDIR) $(dir $@)
156 157 @$(WINDRES) $< -O coff -o $@
157 158  
158 159 #---[ Misc Rules ]-----------------------------------------------------------------------
... ... @@ -161,7 +162,7 @@ $(POTDIR)/$(LIBNAME)/%.pot: \
161 162 %.c
162 163  
163 164 @echo $(notdir $@) ...
164   - @$(MKDIR) `dirname $@`
  165 + @$(MKDIR) $(dir $@)
165 166 @$(XGETTEXT) \
166 167 --language=C \
167 168 --keyword=_ \
... ... @@ -175,42 +176,25 @@ $(POTDIR)/$(LIBNAME)/%.pot: \
175 176 %.rc
176 177  
177 178 @echo $< ...
178   - @$(MKDIR) `dirname $@`
  179 + @$(MKDIR) $(dir $@)
179 180 @touch $@
180 181  
181 182  
182 183 #---[ Release Targets ]------------------------------------------------------------------
183 184  
184 185 all: \
185   - $(BINRLS)/$(LIBNAME)@DLLEXT@ \
  186 + $(BINRLS)/$(SONAME) \
186 187 $(BINRLS)/static/$(LIBNAME).a \
187 188 $(POTDIR)/lib3270.pot
188 189  
189 190 Release: \
190   - $(BINRLS)/$(LIBNAME)@DLLEXT@ \
  191 + $(BINRLS)/$(SONAME) \
191 192 $(BINRLS)/static/$(LIBNAME).a
192 193  
193   -$(BINRLS)/$(LIBNAME)@DLLEXT@: \
194   - $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@
195   -
196   - @echo $< ...
197   - @rm -f $@
198   - @$(LN_S) \
199   - $^ \
200   - $@
201   -
202   -$(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
203   - $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
204   -
205   - @rm -f $@
206   - @$(LN_S) \
207   - $^ \
208   - $@
209   -
210   -$(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
  194 +$(BINRLS)/$(SONAME): \
211 195 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
212 196  
213   - @$(MKDIR) `dirname $@`
  197 + @$(MKDIR) $(dir $@)
214 198 @echo $< ...
215 199 @$(LD) \
216 200 @DLL_LDFLAGS@ \
... ... @@ -224,7 +208,7 @@ $(BINRLS)/static/$(LIBNAME).a: \
224 208 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
225 209  
226 210 @echo $@ ...
227   - @$(MKDIR) `dirname $@`
  211 + @$(MKDIR) $(dir $@)
228 212 @$(AR) rcs $@ $^
229 213  
230 214  
... ... @@ -234,24 +218,24 @@ install: \
234 218 $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG))
235 219  
236 220 install-shared: \
237   - $(BINRLS)/$(LIBNAME)@DLLEXT@
  221 + $(BINRLS)/$(SONAME)
238 222  
239 223 # Install library
240   - @mkdir -p $(DESTDIR)$(libdir)
  224 + @$(MKDIR) $(DESTDIR)$(libdir)
241 225  
242 226 @$(INSTALL_PROGRAM) \
243   - $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
  227 + $(BINRLS)/$(SONAME) \
244 228 $(DESTDIR)$(libdir)
245 229  
246   -
247 230 @$(LN_S) \
248   - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
  231 + $(SONAME) \
249 232 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@
250 233  
251 234 @$(LN_S) \
252 235 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
253 236 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
254 237  
  238 +
255 239 # Install default configs
256 240 @mkdir -p $(DESTDIR)$(datarootdir)/pw3270
257 241  
... ... @@ -297,7 +281,7 @@ $(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c: \
297 281 src/core/X3270.xad \
298 282 $(wildcard src/mkfb/*.c)
299 283  
300   - @$(MKDIR) `dirname $@`
  284 + @$(MKDIR) $(dir $@)
301 285 @$(MKDIR) $(BINDIR)
302 286  
303 287 @echo $< ...
... ... @@ -316,7 +300,7 @@ $(BASEDIR)/src/include/lib3270/actions.h: \
316 300 src/include/lib3270/action_table.h \
317 301 $(wildcard src/mkactions/*.c)
318 302  
319   - @$(MKDIR) `dirname $@`
  303 + @$(MKDIR) $(dir $@)
320 304 @$(MKDIR) $(BINDIR)
321 305 @echo $< ...
322 306  
... ... @@ -333,7 +317,7 @@ $(POTDIR)/lib3270.pot: \
333 317 $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(LIBNAME)/$(SRC).pot)
334 318  
335 319 @rm -f $@
336   - @mkdir -p `dirname $@`
  320 + @$(MKDIR) $(dir $@)
337 321 @$(MSGCAT) --sort-output $^ > $@
338 322  
339 323 locale: \
... ... @@ -347,9 +331,9 @@ Debug: \
347 331  
348 332 $(BINDBG)/$(LIBNAME)@EXEEXT@: \
349 333 $(foreach SRC, $(basename $(TEST_SOURCES)), $(OBJDBG)/$(SRC).o) \
350   - $(BINDBG)/$(LIBNAME)@DLLEXT@
  334 + $(BINDBG)/$(SONAME)
351 335  
352   - @$(MKDIR) `dirname $@`
  336 + @$(MKDIR) $(dir $@)
353 337 @echo $< ...
354 338 @$(LD) \
355 339 -o $@ \
... ... @@ -357,8 +341,7 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
357 341 -L$(BINDBG) \
358 342 -Wl,-rpath,$(BINDBG) \
359 343 $(LDFLAGS) \
360   - $(LIBS) \
361   - -l@LIB3270_NAME@
  344 + $(LIBS)
362 345  
363 346 run: \
364 347 $(BINDBG)/$(LIBNAME)@EXEEXT@
... ... @@ -377,46 +360,19 @@ else
377 360 endif
378 361  
379 362  
380   -$(BINDBG)/$(LIBNAME)@DLLEXT@: \
381   - $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@
382   -
383   - @echo $< ...
384   - @rm -f $@
385   - @$(LN_S) \
386   - $^ \
387   - $@
388   -
389   -$(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
390   - $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
391   -
392   - @rm -f $@
393   - @$(LN_S) \
394   - $^ \
395   - $@
396   -
397   -$(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
  363 +$(BINDBG)/$(SONAME): \
398 364 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
399 365  
400   - @$(MKDIR) `dirname $@`
  366 + @$(MKDIR) $(dir $@)
401 367 @echo $< ...
402 368 @$(LD) \
403   - -shared -Wl,-soname,$(@F) \
  369 + @DLL_LDFLAGS@ \
404 370 -o $@ \
405 371 -L$(BINDBG) \
406 372 $(LDFLAGS) \
407 373 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \
408 374 $(LIBS)
409 375  
410   -zip-debug: \
411   - $(LIBNAME)-debug-@PACKAGE_VERSION@-@host_cpu@.zip
412   -
413   -$(LIBNAME)-debug-@PACKAGE_VERSION@-@host_cpu@.zip: \
414   - $(BINDBG)/$(LIBNAME)@EXEEXT@ \
415   - $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
416   -
417   - @$(ZIP) -9 -j $@ $^
418   -
419   -
420 376 #---[ Clean Targets ]--------------------------------------------------------------------
421 377  
422 378 clean: \
... ...
configure.ac
  Diff comments   View file @6196895
... ... @@ -449,6 +449,21 @@ AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])],
449 449 AC_DEFINE_UNQUOTED(LIB3270_NAME,$app_cv_libname)
450 450 AC_SUBST(LIB3270_NAME,$app_cv_libname)
451 451  
  452 +case "$host" in
  453 + *-mingw32|*-pc-msys)
  454 + AC_SUBST(SONAME,lib$app_cv_libname.dll)
  455 + ;;
  456 +
  457 + s390x-*)
  458 + AC_SUBST(SONAME,lib$app_cv_libname.so)
  459 + ;;
  460 +
  461 + *)
  462 + AC_SUBST(SONAME,lib$app_cv_libname.so.$app_vrs_major.$app_vrs_minor)
  463 +
  464 +esac
  465 +
  466 +
452 467 AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library version for SDK])], [ app_cv_sdkversion="$withval" ],[ app_cv_sdkversion=$VERSION ])
453 468  
454 469 AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion)
... ...