added bin and java sub directories

some more tests


git-svn-id: https://svn.code.sf.net/p/jode/code/branches/stable@1057 379699f6-c40d-0410-875b-85095c16579e
stable
jochen 26 years ago
parent 62e7cb80d6
commit f6f2987fad
  1. 2
      jode/Makefile.am
  2. 5
      jode/acinclude.m4
  3. 23
      jode/configure.in

@ -1,5 +1,5 @@
## Input file for automake to generate the Makefile.in used by configure ## Input file for automake to generate the Makefile.in used by configure
SUBDIRS = jode doc test SUBDIRS = jode bin doc test
EXTRA_DIST = TODO EXTRA_DIST = TODO

@ -6,8 +6,9 @@ dnl
dnl JODE_CHECK_JAVA(path) dnl JODE_CHECK_JAVA(path)
AC_DEFUN(JODE_CHECK_JAVA, AC_DEFUN(JODE_CHECK_JAVA,
[ [
AC_PATH_PROG(JAVAC, javac, "", $PATH:$1/bin) AC_PATH_PROG(JAVA, java, "", $1/bin:$1/jre/bin:$PATH)
AC_PATH_PROG(JAR, jar, "", $PATH:$1/bin) AC_PATH_PROG(JAVAC, javac, "", $1/bin:$PATH)
AC_PATH_PROG(JAR, jar, "", $1/bin:$PATH)
for path in $1/lib $1/jre/lib $1/shared; do for path in $1/lib $1/jre/lib $1/shared; do
for classlib in classes.zip rt.jar; do for classlib in classes.zip rt.jar; do
AC_CHECK_FILES($path/$classlib, AC_CHECK_FILES($path/$classlib,

@ -108,21 +108,32 @@ JODE_CHECK_CLASS(javax.swing.JFrame, $CLASSPATH:$CLASSLIB,
AC_MSG_RESULT($JAVAX_SWING) AC_MSG_RESULT($JAVAX_SWING)
AC_SUBST(JAVAX_SWING) AC_SUBST(JAVAX_SWING)
if test x"$JAVAX_SWING" != x; then if test x"$JAVAX_SWING" != x; then
SWING_CLASSES="jode/swingui/Main.class" SWINGUI="swingui"
else else
AC_MSG_WARN(Swing is not in classpath ... skipping swingui) AC_MSG_WARN(Swing is not in classpath ... skipping swingui)
SWING_CLASSES="" SWINGUI=""
fi fi
AC_SUBST(SWING_CLASSES) AC_SUBST(SWINGUI)
AC_SUBST(CLASSPATH) AC_SUBST(CLASSPATH)
AC_SUBST(JAVAC) AC_SUBST(JAVAC)
AC_OUTPUT(Makefile AC_OUTPUT(Makefile
jode/Makefile jode/Makefile
doc/Makefile jode/bytecode/Makefile
test/Makefile jode/decompiler/Makefile
jode/expr/Makefile
jode/flow/Makefile
jode/jvm/Makefile
jode/obfuscator/Makefile
jode/swingui/Makefile
jode/type/Makefile
jode/util/Makefile
jode/GlobalOptions.java jode/GlobalOptions.java
jode/swingui/Main.java jode/swingui/Main.java
jode/swingui/PackagesTreeModel.java) jode/swingui/PackagesTreeModel.java
bin/Makefile
bin/jode
doc/Makefile
test/Makefile)

Loading…
Cancel
Save