Download as
Browse Code »

Commit a26399ba16ea8fbcfcfd50d3d0facf569e4996a7

Authored by Perry Werneck
1 parent c718423c
Exists in master

Ajustes para empacotamento.

Showing 3 changed files with 24 additions and 4 deletions   Show diff stats
Makefile.in
  Diff comments   View file @a26399b
... ... @@ -43,6 +43,9 @@ javadocdir=@javadocdir@
43 43  
44 44 #---[ Configuration values ]-------------------------------------------------------------
45 45  
  46 +PACKAGE_NAME=pw3270
  47 +PACKAGE_TARNAME=pw3270-java
  48 +
46 49 BASEDIR=@BASEDIR@
47 50 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
48 51  
... ... @@ -111,14 +114,15 @@ install-doc: \
111 114 doc
112 115  
113 116 @$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
114   - @cp -r javadoc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
  117 + @cp -rv ./doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
115 118 @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \;
116 119 @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \;
117 120  
118 121  
119 122 Release: \
120 123 $(BINRLS)/$(LIBNAME) \
121   - $(BINRLS)/$(PLUGIN)
  124 + $(BINRLS)/$(PLUGIN) \
  125 + doc
122 126  
123 127 doc: src/terminal.java
124 128 @$(JAVADOC) -encoding utf-8 -d $@ $^
... ...
src/jni/Makefile.in
  Diff comments   View file @a26399b
... ... @@ -80,6 +80,7 @@ CXX=@CXX@
80 80 LD=@CXX@
81 81 JAVAH=@JAVAH@
82 82 JAVAC=@JAVAC@
  83 +JAR=@JAR@
83 84  
84 85 LIBS=-lpw3270cpp @LIBS@ @LIBICONV@
85 86 CXXFLAGS=@CXXFLAGS@ -I../include
... ... @@ -119,6 +120,13 @@ $(BINDIR)/java/pw3270/%.class: \
119 120 @$(JAVAC) -encoding utf-8 -d $(BINDIR)/java $^
120 121  
121 122  
  123 +$(BINRLS)/pw3270.jar: \
  124 + $(BINDIR)/java/pw3270/terminal.class
  125 +
  126 + @echo $@ ...
  127 + @mkdir -p `dirname $@`
  128 + @$(JAR) -cvf "$@" -C "$(BINDIR)/java" "pw3270"
  129 +
122 130 jni3270.h: \
123 131 $(BINDIR)/java/pw3270/terminal.class
124 132  
... ... @@ -151,10 +159,15 @@ $(BINDBG)/$(LIBNAME): \
151 159 @$(LD) -shared -Wl,-soname,$(notdir $@) $(LDFLAGS) -o $@ $^ $(LIBS)
152 160  
153 161 install: \
154   - $(BINRLS)$(LIBNAME)
  162 + $(BINRLS)/$(LIBNAME) \
  163 + $(BINRLS)/pw3270.jar
  164 +
155 165  
156 166 @$(MKDIR) $(DESTDIR)/$(jnidir)
157   - @$(INSTALL_PROGRAM) $(BINRLS)$(LIBNAME) $(DESTDIR)/$(jnidir)
  167 + @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/$(jnidir)
  168 +
  169 + @$(MKDIR) $(DESTDIR)/$(jvmjardir)
  170 + @$(INSTALL_DATA) $(BINRLS)/pw3270.jar $(DESTDIR)/$(jvmjardir)
158 171  
159 172 clean:
160 173  
... ...
src/plugin/Makefile.in
  Diff comments   View file @a26399b
... ... @@ -112,6 +112,9 @@ Release: \
112 112 install: \
113 113 $(BINRLS)/$(LIBNAME)
114 114  
  115 + @$(MKDIR) $(DESTDIR)/$(libdir)/pw3270-plugins
  116 + @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/$(libdir)/pw3270-plugins
  117 +
115 118 $(BINRLS)/$(LIBNAME): \
116 119 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
117 120  
... ...