Download as
Browse Code »

Commit fadd42b69749ca12ef540b68c47130ef5428f9c4

Authored by perry.werneck@gmail.com
1 parent a0785ba8
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Melhorando documentação do pacote java

Showing 4 changed files with 16 additions and 5 deletions   Show diff stats
@@ -383,6 +383,7 @@ clean: @@ -383,6 +383,7 @@ clean:
383 @make -C src/plugins/dbus3270 clean 383 @make -C src/plugins/dbus3270 clean
384 @make -C src/loffice clean 384 @make -C src/loffice clean
385 @make -C src/php clean 385 @make -C src/php clean
  386 + @make -C src/java clean
386 @make -C src/classlib clean 387 @make -C src/classlib clean
387 @rm -f $(PACKAGE_NAME).png 388 @rm -f $(PACKAGE_NAME).png
388 @rm -f $(PACKAGE_NAME)-logo.png 389 @rm -f $(PACKAGE_NAME)-logo.png
@@ -396,7 +396,7 @@ fi @@ -396,7 +396,7 @@ fi
396 396
397 #--[ SSL ]---------------------------------------------------------------------------------------------------------------------------------------------------- 397 #--[ SSL ]----------------------------------------------------------------------------------------------------------------------------------------------------
398 398
399 -PKG_CHECK_MODULES( [LIBSSL], [libssl], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) 399 +PKG_CHECK_MODULES( [LIBSSL], [openssl], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) )
400 400
401 AC_SUBST(LIBSSL_LIBS) 401 AC_SUBST(LIBSSL_LIBS)
402 AC_SUBST(LIBSSL_CFLAGS) 402 AC_SUBST(LIBSSL_CFLAGS)
@@ -650,6 +650,7 @@ AC_SUBST(EXTENSIONS) @@ -650,6 +650,7 @@ AC_SUBST(EXTENSIONS)
650 AC_SUBST(APP_GUI_SRC) 650 AC_SUBST(APP_GUI_SRC)
651 651
652 AC_SUBST(RLS_LDFLAGS) 652 AC_SUBST(RLS_LDFLAGS)
  653 +AC_SUBST(CLASS_LIBS)
653 654
654 #--[ Output files ]------------------------------------------------------------------------------------------------------------------------------------------- 655 #--[ Output files ]-------------------------------------------------------------------------------------------------------------------------------------------
655 656
src/include/rules.mak.in
  Diff comments   View file @fadd42b
@@ -97,7 +97,6 @@ clean-common: @@ -97,7 +97,6 @@ clean-common:
97 @rm -fr $(BINDIR) 97 @rm -fr $(BINDIR)
98 @rm -fr $(TMPDIR) 98 @rm -fr $(TMPDIR)
99 @rm -f *.log 99 @rm -f *.log
100 - @find . -name "*~" -exec rm -f {} \;  
101 100
102 101
103 102
src/java/Makefile.in
  Diff comments   View file @fadd42b
@@ -107,6 +107,19 @@ all: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ @@ -107,6 +107,19 @@ all: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
107 107
108 Release: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ 108 Release: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
109 109
  110 +zip: jni3270.zip
  111 +
  112 +jni3270.zip: $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc
  113 + @rm -fr .tmp.zip
  114 + @rm -f $@
  115 + @zip -9 -m -j $@ $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java
  116 + @zip -9 -r $@ doc
  117 +
  118 +doc: terminal.java
  119 + @javadoc -d doc $^
  120 +
  121 +
  122 +
110 $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \ 123 $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \
111 $(CLASS_RELEASE_OBJECTS) 124 $(CLASS_RELEASE_OBJECTS)
112 @echo " LD `basename $@`" 125 @echo " LD `basename $@`"
@@ -143,9 +156,6 @@ jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class @@ -143,9 +156,6 @@ jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
143 $(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal 156 $(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal
144 157
145 158
146 -doc: terminal.java  
147 - @javadoc -d doc $^  
148 -  
149 install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ 159 install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
150 160
151 cleanDebug: clean 161 cleanDebug: clean