Commit d9da6680b4040817cd336e17d1cbc3ee2eab2cf3
1 parent
6cef729e
Exists in
master
and in
3 other branches
Adding static version of pkg-config files.
Showing
6 changed files
with
47 additions
and
0 deletions
Show diff stats
configure.ac
| @@ -482,9 +482,12 @@ AC_CONFIG_FILES(Makefile) | @@ -482,9 +482,12 @@ AC_CONFIG_FILES(Makefile) | ||
| 482 | 482 | ||
| 483 | AC_CONFIG_FILES(src/lib3270/Makefile) | 483 | AC_CONFIG_FILES(src/lib3270/Makefile) |
| 484 | AC_CONFIG_FILES(src/lib3270/version.c) | 484 | AC_CONFIG_FILES(src/lib3270/version.c) |
| 485 | + | ||
| 485 | AC_CONFIG_FILES(src/lib3270/lib3270.pc) | 486 | AC_CONFIG_FILES(src/lib3270/lib3270.pc) |
| 487 | +AC_CONFIG_FILES(src/lib3270/lib3270-static.pc) | ||
| 486 | 488 | ||
| 487 | AC_CONFIG_FILES(src/lib3270++/lib3270++.pc) | 489 | AC_CONFIG_FILES(src/lib3270++/lib3270++.pc) |
| 490 | +AC_CONFIG_FILES(src/lib3270++/lib3270++static.pc) | ||
| 488 | 491 | ||
| 489 | AC_CONFIG_FILES(src/lib3270++/Makefile) | 492 | AC_CONFIG_FILES(src/lib3270++/Makefile) |
| 490 | 493 |
src/lib3270++/Makefile.in
| @@ -253,6 +253,12 @@ install-static: \ | @@ -253,6 +253,12 @@ install-static: \ | ||
| 253 | $(BINRLS)/static/$(LIBNAME).a \ | 253 | $(BINRLS)/static/$(LIBNAME).a \ |
| 254 | $(DESTDIR)$(libdir)/$(LIBNAME)static.a | 254 | $(DESTDIR)$(libdir)/$(LIBNAME)static.a |
| 255 | 255 | ||
| 256 | + # Install static PKG-CONFIG files | ||
| 257 | + @mkdir -p $(DESTDIR)$(libdir)/pkgconfig | ||
| 258 | + @$(INSTALL_DATA) \ | ||
| 259 | + $(LIBNAME)static.pc \ | ||
| 260 | + $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME)static.pc | ||
| 261 | + | ||
| 256 | install-dev: | 262 | install-dev: |
| 257 | 263 | ||
| 258 | # Install SDK | 264 | # Install SDK |
| @@ -0,0 +1,15 @@ | @@ -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@ | ||
| 11 | +Description: @PACKAGE_DESCRIPTION@ | ||
| 12 | +Version: @PACKAGE_VERSION@ | ||
| 13 | +Libs: -L\@libdir@ -l3270++static @LIBSSL_LIBS@ @LIBICONV@ @INTL_LIBS@ | ||
| 14 | +Cflags: -I@includedir@ | ||
| 15 | + |
src/lib3270/Makefile.in
| @@ -248,6 +248,11 @@ install-static: \ | @@ -248,6 +248,11 @@ install-static: \ | ||
| 248 | $(BINRLS)/static/$(LIBNAME).a \ | 248 | $(BINRLS)/static/$(LIBNAME).a \ |
| 249 | $(DESTDIR)$(libdir)/$(LIBNAME)-static.a | 249 | $(DESTDIR)$(libdir)/$(LIBNAME)-static.a |
| 250 | 250 | ||
| 251 | + # Install static PKG-CONFIG files | ||
| 252 | + @mkdir -p $(DESTDIR)$(libdir)/pkgconfig | ||
| 253 | + @$(INSTALL_DATA) \ | ||
| 254 | + $(LIBNAME)-static.pc \ | ||
| 255 | + $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME)-static.pc | ||
| 251 | 256 | ||
| 252 | install-dev: | 257 | install-dev: |
| 253 | 258 |
| @@ -0,0 +1,15 @@ | @@ -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@ | ||
| 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 | + |
win/mingw32-lib3270.spec
| @@ -47,6 +47,9 @@ BuildRoot: /var/tmp/%{name}-%{version} | @@ -47,6 +47,9 @@ BuildRoot: /var/tmp/%{name}-%{version} | ||
| 47 | Provides: mingw32(lib:3270) = %{version} | 47 | Provides: mingw32(lib:3270) = %{version} |
| 48 | Provides: mingw32(lib:3270-%{_libvrs}) = %{version} | 48 | Provides: mingw32(lib:3270-%{_libvrs}) = %{version} |
| 49 | 49 | ||
| 50 | +Provides: mingw32(lib:3270++) = %{version} | ||
| 51 | +Provides: mingw32(lib:3270++%{_libvrs}) = %{version} | ||
| 52 | + | ||
| 50 | BuildRequires: autoconf | 53 | BuildRequires: autoconf |
| 51 | BuildRequires: automake | 54 | BuildRequires: automake |
| 52 | BuildRequires: gettext-tools | 55 | BuildRequires: gettext-tools |