Download as
Browse Code »

Commit de2fea38eab56be549bcd199f1a1744f533523f4

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

Updating install process.

Showing 6 changed files with 42 additions and 39 deletions   Show diff stats
Makefile.in
  Diff comments   View file @de2fea3
... ... @@ -27,6 +27,7 @@
27 27 #---[ Library configuration ]------------------------------------------------------------
28 28  
29 29 LIBNAME=lib@LIB3270_NAME@
  30 +INSTALL_PACKAGES=@INSTALL_PACKAGES@
30 31  
31 32 SOURCES= \
32 33 $(wildcard src/core/*.c) \
... ... @@ -227,9 +228,7 @@ $(BINRLS)/static/$(LIBNAME).a: \
227 228 #---[ Install Targets ]------------------------------------------------------------------
228 229  
229 230 install: \
230   - install-shared \
231   - install-static \
232   - install-dev
  231 + $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG))
233 232  
234 233 install-shared: \
235 234 $(BINRLS)/$(LIBNAME)@DLLEXT@
... ... @@ -261,6 +260,11 @@ install-static: \
261 260 $(BINRLS)/static/$(LIBNAME).a \
262 261 $(DESTDIR)$(libdir)/$(LIBNAME)-static.a
263 262  
  263 + @mkdir -p $(DESTDIR)$(libdir)/pkgconfig
  264 + @$(INSTALL_DATA) \
  265 + sdk/lib3270-static.pc \
  266 + $(DESTDIR)$(libdir)/pkgconfig/lib3270-static.pc
  267 +
264 268 install-dev: \
265 269 $(POTDIR)/$(LIBNAME).pot
266 270  
... ... @@ -277,7 +281,7 @@ install-dev: \
277 281 # Install PKG-CONFIG files
278 282 @mkdir -p $(DESTDIR)$(libdir)/pkgconfig
279 283 @$(INSTALL_DATA) \
280   - lib3270.pc \
  284 + sdk/lib3270.pc \
281 285 $(DESTDIR)$(libdir)/pkgconfig/lib3270.pc
282 286  
283 287 # Install translation files
... ... @@ -418,7 +422,6 @@ clean: \
418 422  
419 423 @rm -fr $(BASEDIR)/.tmp/$(LIBNAME)
420 424 @rm -fr $(POTDIR)/$(LIBNAME)
421   - @rm -fr src/include/marshal
422 425  
423 426 cleanDebug:
424 427  
... ...
configure.ac
  Diff comments   View file @de2fea3
... ... @@ -583,8 +583,8 @@ AC_SUBST(INSTALL_PACKAGES)
583 583  
584 584 AC_CONFIG_FILES(Makefile)
585 585  
586   -AC_CONFIG_FILES(src/core/lib3270.pc)
587   -AC_CONFIG_FILES(src/core/lib3270-static.pc)
  586 +AC_CONFIG_FILES(sdk/lib3270.pc)
  587 +AC_CONFIG_FILES(sdk/lib3270-static.pc)
588 588  
589 589 dnl ---------------------------------------------------------------------------
590 590 dnl Output the generated config.status script.
... ...
sdk/lib3270-static.pc.in 0 → 100644
  Diff comments   View file @de2fea3
... ... @@ -0,0 +1,15 @@
  1 +prefix=@prefix@
  2 +exec_prefix=@exec_prefix@
  3 +libdir=@libdir@
  4 +includedir=@includedir@
  5 +
  6 +version_major=@PACKAGE_MAJOR_VERSION@
  7 +version_minor=@PACKAGE_MINOR_VERSION@
  8 +sdk_version=@LIB3270_SDK_VERSION@
  9 +
  10 +Name: @PACKAGE_NAME@-static
  11 +Description: @PACKAGE_DESCRIPTION@ (static library)
  12 +Version: @PACKAGE_VERSION@
  13 +Libs: -L\@libdir@ -l@LIB3270_NAME@-static @LIBSSL_LIBS@ @INTL_LIBS@
  14 +Cflags: -I@includedir@
  15 +
... ...
sdk/lib3270.pc.in 0 → 100644
  Diff comments   View file @de2fea3
... ... @@ -0,0 +1,17 @@
  1 +prefix=@prefix@
  2 +exec_prefix=@exec_prefix@
  3 +libdir=@libdir@
  4 +includedir=@includedir@
  5 +
  6 +version_major=@PACKAGE_MAJOR_VERSION@
  7 +version_minor=@PACKAGE_MINOR_VERSION@
  8 +sdk_version=@LIB3270_SDK_VERSION@
  9 +library_name=@LIB3270_NAME@
  10 +
  11 +Name: @PACKAGE_NAME@
  12 +Description: @PACKAGE_DESCRIPTION@
  13 +Version: @PACKAGE_VERSION@
  14 +Libs: -L\@libdir@ -l@LIB3270_NAME@
  15 +Libs.private: @LIBSSL_LIBS@ @INTL_LIBS@
  16 +Cflags: -I@includedir@
  17 +
... ...
src/core/lib3270-static.pc.in
View file @1612978
... ... @@ -1,15 +0,0 @@
1   -prefix=@prefix@
2   -exec_prefix=@exec_prefix@
3   -libdir=@libdir@
4   -includedir=@includedir@
5   -
6   -version_major=@PACKAGE_MAJOR_VERSION@
7   -version_minor=@PACKAGE_MINOR_VERSION@
8   -sdk_version=@LIB3270_SDK_VERSION@
9   -
10   -Name: @PACKAGE_NAME@-static
11   -Description: @PACKAGE_DESCRIPTION@ (static library)
12   -Version: @PACKAGE_VERSION@
13   -Libs: -L\@libdir@ -l@LIB3270_NAME@-static @LIBSSL_LIBS@ @INTL_LIBS@
14   -Cflags: -I@includedir@
15   -
src/core/lib3270.pc.in
View file @1612978
... ... @@ -1,17 +0,0 @@
1   -prefix=@prefix@
2   -exec_prefix=@exec_prefix@
3   -libdir=@libdir@
4   -includedir=@includedir@
5   -
6   -version_major=@PACKAGE_MAJOR_VERSION@
7   -version_minor=@PACKAGE_MINOR_VERSION@
8   -sdk_version=@LIB3270_SDK_VERSION@
9   -library_name=@LIB3270_NAME@
10   -
11   -Name: @PACKAGE_NAME@
12   -Description: @PACKAGE_DESCRIPTION@
13   -Version: @PACKAGE_VERSION@
14   -Libs: -L\@libdir@ -l@LIB3270_NAME@
15   -Libs.private: @LIBSSL_LIBS@ @INTL_LIBS@
16   -Cflags: -I@includedir@
17   -