From 2def4117b312c0c193b9f4938c024f51259f16c2 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 18 Jan 2017 11:10:38 -0200 Subject: [PATCH] Atualizando processo de instalação --- Makefile.in | 24 +++++++++++++++++++++++- configure.ac | 4 ++-- devel/lib3270.pc.in | 12 ------------ devel/pw3270.pc.in | 12 ------------ sdk/lib3270.pc.in | 12 ++++++++++++ sdk/pw3270.pc.in | 12 ++++++++++++ src/lib3270/Makefile.in | 17 +++++++++++++++++ src/pw3270/Makefile.in | 22 ++++++++++++++++++++++ 8 files changed, 88 insertions(+), 27 deletions(-) delete mode 100644 devel/lib3270.pc.in delete mode 100644 devel/pw3270.pc.in create mode 100644 sdk/lib3270.pc.in create mode 100644 sdk/pw3270.pc.in diff --git a/Makefile.in b/Makefile.in index 778c64c..091e958 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,19 +76,41 @@ $(BINRLS)/%@DLLEXT@: \ @$(MAKE) -C src/$(basename $(notdir $@)) $@ +$(DESTDIR)$(libdir)/%@DLLEXT@: \ + $(DEPENDS) \ + ./src/%/* + + @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install + + $(BINRLS)/%@EXEEXT@: \ $(DEPENDS) \ ./src/%/* @$(MAKE) -C src/$(basename $(notdir $@)) $@ +$(DESTDIR)$(libdir)/%@EXEEXT@: \ + $(DEPENDS) \ + ./src/%/* + + @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install + #---[ Release targets ]-------------------------------------------------------- +all: \ + $(BINRLS)/lib3270@DLLEXT@ \ + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ + Release: \ $(BINRLS)/lib3270@DLLEXT@ \ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ +install: \ + $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \ + $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)@EXEEXT@ + + #---[ Debug targets ]---------------------------------------------------------- Debug: \ @@ -101,7 +123,7 @@ run: \ @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ -#---[ Install Targets ]-------------------------------------------------------- +#---[ Package Targets ]-------------------------------------------------------- #---[ Clean Targets ]---------------------------------------------------------- diff --git a/configure.ac b/configure.ac index cf71439..ec62f89 100644 --- a/configure.ac +++ b/configure.ac @@ -104,8 +104,8 @@ case "$host" in # LIBS="-Wl,--no-allow-shlib-undefined,--as-needed,--no-undefined -pthread $LIBS" LIBS="-pthread $LIBS" - AC_CONFIG_FILES(devel/lib3270.pc) - AC_CONFIG_FILES(devel/pw3270.pc) + AC_CONFIG_FILES(sdk/lib3270.pc) + AC_CONFIG_FILES(sdk/pw3270.pc) esac diff --git a/devel/lib3270.pc.in b/devel/lib3270.pc.in deleted file mode 100644 index 6497470..0000000 --- a/devel/lib3270.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: lib3270 -Description: TN3270E Library calls used by @PACKAGE@ -Version: @PACKAGE_VERSION@ -Libs: -L\@libdir@ -l3270 -Libs.private: @LIBSSL_LIBS@ -Cflags: -I@includedir@ - diff --git a/devel/pw3270.pc.in b/devel/pw3270.pc.in deleted file mode 100644 index 56e7003..0000000 --- a/devel/pw3270.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: pw3270 -Description: @PACKAGE@ GTK widgets and support calls for plugin development -Version: @PACKAGE_VERSION@ -Libs: -L\@libdir@ -l@PACKAGE_TARNAME@ -Libs.private: lib3270 -Cflags: -I@includedir@ - diff --git a/sdk/lib3270.pc.in b/sdk/lib3270.pc.in new file mode 100644 index 0000000..6497470 --- /dev/null +++ b/sdk/lib3270.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: lib3270 +Description: TN3270E Library calls used by @PACKAGE@ +Version: @PACKAGE_VERSION@ +Libs: -L\@libdir@ -l3270 +Libs.private: @LIBSSL_LIBS@ +Cflags: -I@includedir@ + diff --git a/sdk/pw3270.pc.in b/sdk/pw3270.pc.in new file mode 100644 index 0000000..56e7003 --- /dev/null +++ b/sdk/pw3270.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: pw3270 +Description: @PACKAGE@ GTK widgets and support calls for plugin development +Version: @PACKAGE_VERSION@ +Libs: -L\@libdir@ -l@PACKAGE_TARNAME@ +Libs.private: lib3270 +Cflags: -I@includedir@ + diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index 83653ec..d72d969 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -129,6 +129,23 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @$(MKDIR) `dirname $@` @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -o $@ $^ $(LIBS) +install: \ + $(BINRLS)/$(LIBNAME) + + @$(MKDIR) $(DESTDIR)$(libdir) + + @$(INSTALL_PROGRAM) \ + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ + $(DESTDIR)$(libdir) + + @$(LN_S) -f \ + $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ + $(DESTDIR)$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ + + @$(LN_S) -f \ + $(LIBNAME).@PACKAGE_MAJOR_VERSION@ \ + $(DESTDIR)$(libdir)/$(LIBNAME) + #---[ Debug Targets ]-------------------------------------------------------------------- Debug: \ diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index a6c8bbc..0a429e5 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -150,6 +150,28 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @$(MKDIR) `dirname $@` @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINRLS) -o $@ $^ $(LIBS) +install: \ + $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) + + @$(MKDIR) $(DESTDIR)$(libdir) + + @$(INSTALL_PROGRAM) \ + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ + $(DESTDIR)$(libdir) + + @$(LN_S) -f \ + $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ + $(DESTDIR)$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ + + @$(LN_S) -f \ + $(LIBNAME).@PACKAGE_MAJOR_VERSION@ \ + $(DESTDIR)$(libdir)/$(LIBNAME) + + @$(MKDIR) $(DESTDIR)$(bindir) + + @$(INSTALL_PROGRAM) \ + $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) \ + $(DESTDIR)$(bindir) #---[ Debug Targets ]-------------------------------------------------------------------- -- libgit2 0.21.2