Download as
Browse Code »

Commit 2def4117b312c0c193b9f4938c024f51259f16c2

Authored by Perry Werneck
1 parent 163dd8d3
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Atualizando processo de instalação

Showing 8 changed files with 88 additions and 27 deletions   Show diff stats
@@ -76,19 +76,41 @@ $(BINRLS)/%@DLLEXT@: \ @@ -76,19 +76,41 @@ $(BINRLS)/%@DLLEXT@: \
76 76
77 @$(MAKE) -C src/$(basename $(notdir $@)) $@ 77 @$(MAKE) -C src/$(basename $(notdir $@)) $@
78 78
  79 +$(DESTDIR)$(libdir)/%@DLLEXT@: \
  80 + $(DEPENDS) \
  81 + ./src/%/*
  82 +
  83 + @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install
  84 +
  85 +
79 $(BINRLS)/%@EXEEXT@: \ 86 $(BINRLS)/%@EXEEXT@: \
80 $(DEPENDS) \ 87 $(DEPENDS) \
81 ./src/%/* 88 ./src/%/*
82 89
83 @$(MAKE) -C src/$(basename $(notdir $@)) $@ 90 @$(MAKE) -C src/$(basename $(notdir $@)) $@
84 91
  92 +$(DESTDIR)$(libdir)/%@EXEEXT@: \
  93 + $(DEPENDS) \
  94 + ./src/%/*
  95 +
  96 + @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install
  97 +
85 98
86 #---[ Release targets ]-------------------------------------------------------- 99 #---[ Release targets ]--------------------------------------------------------
87 100
  101 +all: \
  102 + $(BINRLS)/lib3270@DLLEXT@ \
  103 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@
  104 +
88 Release: \ 105 Release: \
89 $(BINRLS)/lib3270@DLLEXT@ \ 106 $(BINRLS)/lib3270@DLLEXT@ \
90 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ 107 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@
91 108
  109 +install: \
  110 + $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \
  111 + $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)@EXEEXT@
  112 +
  113 +
92 #---[ Debug targets ]---------------------------------------------------------- 114 #---[ Debug targets ]----------------------------------------------------------
93 115
94 Debug: \ 116 Debug: \
@@ -101,7 +123,7 @@ run: \ @@ -101,7 +123,7 @@ run: \
101 123
102 @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ 124 @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
103 125
104 -#---[ Install Targets ]-------------------------------------------------------- 126 +#---[ Package Targets ]--------------------------------------------------------
105 127
106 128
107 #---[ Clean Targets ]---------------------------------------------------------- 129 #---[ Clean Targets ]----------------------------------------------------------
@@ -104,8 +104,8 @@ case "$host" in @@ -104,8 +104,8 @@ case "$host" in
104 # LIBS="-Wl,--no-allow-shlib-undefined,--as-needed,--no-undefined -pthread $LIBS" 104 # LIBS="-Wl,--no-allow-shlib-undefined,--as-needed,--no-undefined -pthread $LIBS"
105 LIBS="-pthread $LIBS" 105 LIBS="-pthread $LIBS"
106 106
107 - AC_CONFIG_FILES(devel/lib3270.pc)  
108 - AC_CONFIG_FILES(devel/pw3270.pc) 107 + AC_CONFIG_FILES(sdk/lib3270.pc)
  108 + AC_CONFIG_FILES(sdk/pw3270.pc)
109 109
110 esac 110 esac
111 111
devel/lib3270.pc.in
View file @163dd8d
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -prefix=@prefix@  
2 -exec_prefix=@exec_prefix@  
3 -libdir=@libdir@  
4 -includedir=@includedir@  
5 -  
6 -Name: lib3270  
7 -Description: TN3270E Library calls used by @PACKAGE@  
8 -Version: @PACKAGE_VERSION@  
9 -Libs: -L\@libdir@ -l3270  
10 -Libs.private: @LIBSSL_LIBS@  
11 -Cflags: -I@includedir@  
12 -  
devel/pw3270.pc.in
View file @163dd8d
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -prefix=@prefix@  
2 -exec_prefix=@exec_prefix@  
3 -libdir=@libdir@  
4 -includedir=@includedir@  
5 -  
6 -Name: pw3270  
7 -Description: @PACKAGE@ GTK widgets and support calls for plugin development  
8 -Version: @PACKAGE_VERSION@  
9 -Libs: -L\@libdir@ -l@PACKAGE_TARNAME@  
10 -Libs.private: lib3270  
11 -Cflags: -I@includedir@  
12 -  
sdk/lib3270.pc.in 0 → 100644
  Diff comments   View file @2def411
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +prefix=@prefix@
  2 +exec_prefix=@exec_prefix@
  3 +libdir=@libdir@
  4 +includedir=@includedir@
  5 +
  6 +Name: lib3270
  7 +Description: TN3270E Library calls used by @PACKAGE@
  8 +Version: @PACKAGE_VERSION@
  9 +Libs: -L\@libdir@ -l3270
  10 +Libs.private: @LIBSSL_LIBS@
  11 +Cflags: -I@includedir@
  12 +
sdk/pw3270.pc.in 0 → 100644
  Diff comments   View file @2def411
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +prefix=@prefix@
  2 +exec_prefix=@exec_prefix@
  3 +libdir=@libdir@
  4 +includedir=@includedir@
  5 +
  6 +Name: pw3270
  7 +Description: @PACKAGE@ GTK widgets and support calls for plugin development
  8 +Version: @PACKAGE_VERSION@
  9 +Libs: -L\@libdir@ -l@PACKAGE_TARNAME@
  10 +Libs.private: lib3270
  11 +Cflags: -I@includedir@
  12 +
src/lib3270/Makefile.in
  Diff comments   View file @2def411
@@ -129,6 +129,23 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -129,6 +129,23 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
129 @$(MKDIR) `dirname $@` 129 @$(MKDIR) `dirname $@`
130 @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -o $@ $^ $(LIBS) 130 @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -o $@ $^ $(LIBS)
131 131
  132 +install: \
  133 + $(BINRLS)/$(LIBNAME)
  134 +
  135 + @$(MKDIR) $(DESTDIR)$(libdir)
  136 +
  137 + @$(INSTALL_PROGRAM) \
  138 + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
  139 + $(DESTDIR)$(libdir)
  140 +
  141 + @$(LN_S) -f \
  142 + $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
  143 + $(DESTDIR)$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
  144 +
  145 + @$(LN_S) -f \
  146 + $(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
  147 + $(DESTDIR)$(libdir)/$(LIBNAME)
  148 +
132 #---[ Debug Targets ]-------------------------------------------------------------------- 149 #---[ Debug Targets ]--------------------------------------------------------------------
133 150
134 Debug: \ 151 Debug: \
src/pw3270/Makefile.in
  Diff comments   View file @2def411
@@ -150,6 +150,28 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -150,6 +150,28 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
150 @$(MKDIR) `dirname $@` 150 @$(MKDIR) `dirname $@`
151 @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINRLS) -o $@ $^ $(LIBS) 151 @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINRLS) -o $@ $^ $(LIBS)
152 152
  153 +install: \
  154 + $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT)
  155 +
  156 + @$(MKDIR) $(DESTDIR)$(libdir)
  157 +
  158 + @$(INSTALL_PROGRAM) \
  159 + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
  160 + $(DESTDIR)$(libdir)
  161 +
  162 + @$(LN_S) -f \
  163 + $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
  164 + $(DESTDIR)$(libdir)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
  165 +
  166 + @$(LN_S) -f \
  167 + $(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
  168 + $(DESTDIR)$(libdir)/$(LIBNAME)
  169 +
  170 + @$(MKDIR) $(DESTDIR)$(bindir)
  171 +
  172 + @$(INSTALL_PROGRAM) \
  173 + $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) \
  174 + $(DESTDIR)$(bindir)
153 175
154 #---[ Debug Targets ]-------------------------------------------------------------------- 176 #---[ Debug Targets ]--------------------------------------------------------------------
155 177