From a7a253f9d4cc82794c5a5360f3a017fd9b63de9b Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Mon, 19 Feb 2018 11:56:51 +0200 Subject: jvm: rename fakejvm to jvm --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0600d3a..f568afe 100644 --- a/Makefile +++ b/Makefile @@ -36,15 +36,17 @@ runtime/libpthread.so: private LDLIBS += -lpthread runtime/libpthread.so: runtime src/libpthread.c runtime/libandroid.so: runtime src/libandroid.c runtime/liblog.so: runtime src/liblog.c +native: runtime/libc.so runtime/libpthread.so runtime/libandroid.so runtime/liblog.so linker.a: CFLAGS += -D_GNU_SOURCE -DANDROID_X86_LINKER -DLINKER_DEBUG=1 linker.a: CFLAGS += -Wno-pedantic -Wno-variadic-macros -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast linker.a: src/linker/dlfcn.o src/linker/linker.o src/linker/linker_environ.o src/linker/rt.o src/linker/strlcpy.o +jvm.a: CFLAGS += -D_GNU_SOURCE jvm.a: CFLAGS += -Wno-unused-variable -Wno-pedantic -jvm.a: src/fakejvm/jvm.o +jvm.a: src/jvm/jvm.o app: private LDLIBS += -ldl -Wl,-rpath,runtime -app: src/app.c linker.a jvm.a runtime/libc.so runtime/libpthread.so runtime/libandroid.so runtime/liblog.so +app: src/app.c linker.a native jvm.a install-bin: $(bins) install -Dm755 $^ -t "$(DESTDIR)$(PREFIX)$(BINDIR)" @@ -52,7 +54,7 @@ install-bin: $(bins) install: install-bin clean: - $(RM) $(bins) *.a src/linker/*.o src/fakejvm/*.o + $(RM) $(bins) *.a src/linker/*.o src/jvm/*.o $(RM) -r runtime .PHONY: all clean install -- cgit v1.2.3