AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)
-JAVA = $(top_builddir)/src/cacao/cacao
-JAVAH = $(CACAOH)
-
-if WITH_CLASSPATH_GNU
-BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-else
-BOOTCLASSPATH = $(CLASSPATH_CLASSES)
-endif
-
+JAVA = $(top_builddir)/src/cacao/cacao
JAVACMD = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
$(TESTNAMES) $(NOTESTNAMES):
@$(JAVACCMD) -d . $(srcdir)/$@.java
- @$(JAVAH) -bootclasspath $(BOOTCLASSPATH) $@
- @$(CC) -shared $(AM_CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC
+ @$(CC) -shared $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC
@LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs:. $(SHELL) $(srcdir)/../Test.sh "$(JAVACMD)" $@ $(srcdir)