diff --git a/Makefile.in b/Makefile.in index 75db2db..691d89c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -140,9 +140,11 @@ $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE all: Release -Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \ - $(foreach EXT, $(EXTENSIONS), $(EXT)) \ - locale pixmaps +Release: \ + $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \ + $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \ + $(foreach EXT, $(EXTENSIONS), $(EXT)) \ + locale pixmaps $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@ $(DEPENDS) @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) @@ -164,7 +166,8 @@ $(BINDIR)/Release/tn3270.so: src/php/* @$(MKDIR) `dirname $@` @cp src/php/.bin/Release/php3270.so $@ -java: $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@ +java: src/java/Makefile src/java/*.cc src/java/*.h src/java/*.java + @$(MAKE) -C src/java Release $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@: src/java/* @$(MAKE) -C src/java Release diff --git a/po/pt_BR.po b/po/pt_BR.po index f5246aa..29131ac 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-12 11:42-0300\n" +"POT-Creation-Date: 2015-06-16 14:52-0300\n" "PO-Revision-Date: 2014-02-17 08:05-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Portugues <>\n" diff --git a/pw3270.spec.in b/pw3270.spec.in index fca01b6..11b55f7 100644 --- a/pw3270.spec.in +++ b/pw3270.spec.in @@ -242,7 +242,6 @@ make all %install rm -rf $RPM_BUILD_ROOT -cd %{_builddir}/%{name}-%{version} %makeinstall %find_lang %{name} langfiles @@ -330,6 +329,11 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_jnidir}/libjni3270.so %{_jvmjardir}/pw3270.jar + + +%dir %{_javadocdir}/%{name}/* +%{_javadocdir}/%{name}/* + %endif diff --git a/src/java/Makefile.in b/src/java/Makefile.in index b719bbf..0c89124 100644 --- a/src/java/Makefile.in +++ b/src/java/Makefile.in @@ -99,7 +99,7 @@ $(BINDIR)/java/$(PACKAGE_NAME)/%.class: %.java @mkdir -p `dirname $@` @$(JAVAC) -encoding utf-8 -d $(BINDIR)/java $^ -$(BINRLS)/$(PACKAGE_NAME).jar: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class Makefile +$(BINRLS)/$(PACKAGE_NAME).jar: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class @echo $@ ... @mkdir -p `dirname $@` @$(JAR) -cvf "$@" -C "$(BINDIR)/java" "$(PACKAGE_NAME)" @@ -112,19 +112,19 @@ Release: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ zip: jni3270.zip -jni3270.zip: $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc +jni3270.zip: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc @rm -fr .tmp.zip @rm -f $@ - @zip -9 -j $@ $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java + @zip -9 -j $@ $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java @zip -9 -r $@ doc doc: terminal.java @$(JAVADOC) -d doc $^ +$(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@: \ + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \ + $(CLASS_RELEASE_OBJECTS) - -$(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \ - $(CLASS_RELEASE_OBJECTS) @echo " LD `basename $@`" @$(MKDIR) `dirname $@` @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) @@ -146,7 +146,8 @@ run: $(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class #---[ Misc targets ]----------------------------------------------------------- -install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ doc +install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(BINRLS)/$(PACKAGE_NAME).jar doc + @$(MKDIR) $(DESTDIR)/$(jnidir) @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ $(DESTDIR)/$(jnidir) @@ -158,12 +159,10 @@ install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ doc @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \; @find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \; - jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class @echo $< ... @mkdir -p `dirname $@` - $(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal - + @$(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal cleanDebug: clean diff --git a/src/php/Makefile.in b/src/php/Makefile.in index 8101ba5..f7cf343 100644 --- a/src/php/Makefile.in +++ b/src/php/Makefile.in @@ -90,7 +90,7 @@ $(BINRLS)/php3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SR $(CLASS_RELEASE_OBJECTS) @echo " LD `basename $@`" @$(MKDIR) `dirname $@` - $(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) + @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) #---[ Debug targets ]---------------------------------------------------------- diff --git a/src/plugins/rx3270/Makefile.in b/src/plugins/rx3270/Makefile.in index 73d18a1..165b4e2 100644 --- a/src/plugins/rx3270/Makefile.in +++ b/src/plugins/rx3270/Makefile.in @@ -65,12 +65,12 @@ $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS) + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS) $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS) + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS) install: @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins -- libgit2 0.21.2