diff --git a/Makefile.in b/Makefile.in index dce64de..75db2db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -383,6 +383,7 @@ clean: @make -C src/plugins/dbus3270 clean @make -C src/loffice clean @make -C src/php clean + @make -C src/java clean @make -C src/classlib clean @rm -f $(PACKAGE_NAME).png @rm -f $(PACKAGE_NAME)-logo.png diff --git a/configure.ac b/configure.ac index 871abe1..ebab14c 100644 --- a/configure.ac +++ b/configure.ac @@ -396,7 +396,7 @@ fi #--[ SSL ]---------------------------------------------------------------------------------------------------------------------------------------------------- -PKG_CHECK_MODULES( [LIBSSL], [libssl], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) +PKG_CHECK_MODULES( [LIBSSL], [openssl], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) AC_SUBST(LIBSSL_LIBS) AC_SUBST(LIBSSL_CFLAGS) @@ -650,6 +650,7 @@ AC_SUBST(EXTENSIONS) AC_SUBST(APP_GUI_SRC) AC_SUBST(RLS_LDFLAGS) +AC_SUBST(CLASS_LIBS) #--[ Output files ]------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/src/include/rules.mak.in b/src/include/rules.mak.in index 6f2b510..f367d99 100644 --- a/src/include/rules.mak.in +++ b/src/include/rules.mak.in @@ -97,7 +97,6 @@ clean-common: @rm -fr $(BINDIR) @rm -fr $(TMPDIR) @rm -f *.log - @find . -name "*~" -exec rm -f {} \; diff --git a/src/java/Makefile.in b/src/java/Makefile.in index ea8d337..e3b06f5 100644 --- a/src/java/Makefile.in +++ b/src/java/Makefile.in @@ -107,6 +107,19 @@ all: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ Release: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ +zip: jni3270.zip + +jni3270.zip: $(BINRLS)/libjni3270.so $(BINRLS)/$(PACKAGE_NAME).jar testprogram.java doc + @rm -fr .tmp.zip + @rm -f $@ + @zip -9 -m -j $@ $(BINRLS)/libjni3270.so $(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) @echo " LD `basename $@`" @@ -143,9 +156,6 @@ jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class $(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal -doc: terminal.java - @javadoc -d doc $^ - install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@ cleanDebug: clean -- libgit2 0.21.2