From 8dd659880942fd1bfa7807b59299342f04c19bd2 Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Sat, 2 Jun 2018 21:55:53 +0300 Subject: Makefile: Use private override Makes sure stuff appends even if LDFLAGS etc are provided on command line. --- Makefile | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 04cdddf..d5dc142 100644 --- a/Makefile +++ b/Makefile @@ -27,38 +27,39 @@ $(bins): %: $(LINK.c) $(filter %.c %.a,$^) $(LDLIBS) -o $@ verbose: src/wrapper/verbose.h -wrapper.a: private CPPFLAGS += -D_GNU_SOURCE +wrapper.a: private override CPPFLAGS += -D_GNU_SOURCE wrapper.a: verbose src/wrapper/wrapper.c src/wrapper/wrapper.h -runtime/libdl.so: private CPPFLAGS += -D_GNU_SOURCE -DLINKER_DEBUG=1 -runtime/libdl.so: private CFLAGS += -Wno-pedantic -Wno-variadic-macros -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast +runtime/libdl.so: private override CPPFLAGS += -D_GNU_SOURCE -DLINKER_DEBUG=1 +runtime/libdl.so: private override CFLAGS += -Wno-pedantic -Wno-variadic-macros -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast runtime/libdl.so: wrapper.a src/linker/dlfcn.c src/linker/linker.c src/linker/linker_environ.c src/linker/rt.c src/linker/strlcpy.c -runtime/libc.so: private CPPFLAGS += -D_GNU_SOURCE -runtime/libc.so: private CFLAGS += -Wno-deprecated-declarations -runtime/libc.so: private LDLIBS += `pkg-config --libs libbsd libunwind` +runtime/libc.so: private override CPPFLAGS += -D_GNU_SOURCE +runtime/libc.so: private override CFLAGS += -Wno-deprecated-declarations +runtime/libc.so: private override LDLIBS += `pkg-config --libs libbsd libunwind` runtime/libc.so: verbose src/libc.c -runtime/libpthread.so: private CPPFLAGS += -D_GNU_SOURCE -runtime/libpthread.so: private LDLIBS += -lpthread +runtime/libpthread.so: private override CPPFLAGS += -D_GNU_SOURCE +runtime/libpthread.so: private override LDLIBS += -lpthread runtime/libpthread.so: src/libpthread.c -runtime/libandroid.so: private LDLIBS += `pkg-config --libs glfw3` +runtime/libandroid.so: private override LDLIBS += `pkg-config --libs glfw3` runtime/libandroid.so: src/libandroid.c runtime/liblog.so: src/liblog.c -runtime/libEGL.so: private CPPFLAGS += -D_GNU_SOURCE -runtime/libEGL.so: private LDLIBS += -lEGL `pkg-config --libs glfw3` +runtime/libEGL.so: private override CPPFLAGS += -D_GNU_SOURCE +runtime/libEGL.so: private override LDLIBS += -lEGL `pkg-config --libs glfw3` runtime/libEGL.so: src/libEGL.c native: runtime/libdl.so runtime/libc.so runtime/libpthread.so runtime/libandroid.so runtime/liblog.so runtime/libEGL.so -jvm.a: private CPPFLAGS += -D_GNU_SOURCE -jvm.a: private CFLAGS += -Wno-unused-variable -Wno-pedantic +jvm.a: private override CPPFLAGS += -D_GNU_SOURCE +jvm.a: private override CFLAGS += -Wno-unused-variable -Wno-pedantic jvm.a: wrapper.a src/jvm/jvm.c -runtime/libjvm-java.so: private CPPFLAGS += -D_GNU_SOURCE +runtime/libjvm-java.so: private override CPPFLAGS += -D_GNU_SOURCE runtime/libjvm-java.so: verbose src/libjvm-java.c runtime/libjvm-android.so: verbose src/libjvm-android.c runtime/libjvm-unity.so: verbose src/libjvm-unity.c java: runtime/libjvm-java.so runtime/libjvm-android.so runtime/libjvm-unity.so -app: private LDLIBS += -ldl -Wl,-rpath,runtime runtime/libdl.so runtime/libpthread.so -app: private LDLIBS += runtime/libjvm-java.so runtime/libjvm-android.so runtime/libjvm-unity.so +app: private override CFLAGS += -Wno-pedantic -D_DEFAULT_SOURCE +app: private override LDLIBS += -ldl -Wl,-rpath,runtime runtime/libdl.so runtime/libpthread.so +app: private override LDLIBS += runtime/libjvm-java.so runtime/libjvm-android.so runtime/libjvm-unity.so app: wrapper.a src/app.c native jvm.a java install-bin: $(bins) -- cgit v1.2.3