Fancy up Makefile

Author: elicn

examples/src/linux/Makefile

@@ -1,27 +1,48 @@
-CC = gcc
 
+# c compiler and flags
+CC = gcc
 CFLAGS = -Wall -O2 -s
 
-#CFLAGS += -DDEBUG
+# cpp compiler and flags
+CXX = g++
+CXXFLAGS = -Wall -O2 -s
 
-OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+# preprocessor flags, common to c and cpp
+CPPFLAGS = -MD
 
+OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
 DEPS = $(patsubst %.o,%.d,$(OBJS))
-CFLAGS += -MD
 MISSING_DEPS = $(filter-out $(wildcard $(DEPS)),$(DEPS))
 MISSING_DEPS_SOURCES = $(wildcard $(patsubst %.d,%.c,$(MISSING_DEPS)))
 
-LIBS=
-
-TARGET = arm_hello arm_hello_static \
-            arm64_hello arm64_hello_static \
-            mips32el_hello mips32el_hello_static \
-            x86_hello x86_hello_static \
-            x8664_hello x8664_hello_static \
-            patch_test.bin \
-            arm_sleep_hello arm64_sleep_hello
-
-all : $(TARGET)
+TARGETS =					\
+	arm_hello				\
+	arm_hello_static		\
+	arm_sleep_hello			\
+	arm64_hello				\
+ 	arm64_hello_static		\
+ 	arm64_sleep_hello		\
+	mips32el_hello			\
+ 	mips32el_hello_static	\
+	x86_hello				\
+ 	x86_hello_static		\
+ 	x86_hello_cpp			\
+	x86_hello_cpp_static	\
+	x8664_hello				\
+ 	x8664_hello_static		\
+ 	x8664_hello_cpp			\
+	x8664_hello_cpp_static	\
+	patch_test.bin
+
+.PHONY: all clean
+
+all : $(TARGETS)
+
+ARM_TARGETS: $(filter arm_%,$(TARGETS))
+ARM64_TARGETS: $(filter arm64_%,$(TARGETS))
+MIPS32EL_TARGETS: $(filter mips32el_%,$(TARGETS))
+X86_TARGETS: $(filter x86_%,$(TARGETS))
+X8664_TARGETS: $(filter x8664_%,$(TARGETS))
 
 ifneq ($(MISSING_DEPS),)
 $(MISSING_DEPS) :
@@ -31,67 +52,78 @@ endif
 -include $(DEPS)
 
 arm_hello: hello.c
-	arm-linux-gnueabihf-gcc -Wall -O2 -s $< -o $@
+	arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 arm_hello_static: hello.c
-	arm-linux-gnueabihf-gcc -Wall -O2 -s -static $< -o $@
+	arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -static -o $@ $<
 
 arm_sleep_hello: sleep_hello.c
-	arm-linux-gnueabihf-gcc -Wall -O2 -s $< -o $@
+	arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 arm64_hello: hello.c
-	aarch64-linux-gnu-gcc -Wall -O2 -s $< -o $@
+	aarch64-linux-gnu-gcc $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 arm64_hello_static: hello.c
-	aarch64-linux-gnu-gcc -Wall -O2 -s -static $< -o $@
+	aarch64-linux-gnu-gcc $(CPPFLAGS) $(CFLAGS) -static -o $@ $<
 
 arm64_sleep_hello: sleep_hello.c
-	aarch64-linux-gnu-gcc -Wall -O2 -s $< -o $@
+	aarch64-linux-gnu-gcc $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 # not included in default targets because requires the Android NDK to be installed.
 # add <NDK>/toolchains/llvm/prebuilt/linux-x86_64/bin/ to your path
 arm64_android_hello: hello.c
-	aarch64-linux-android29-clang -Wall -O2 -s $< -o $@
+	aarch64-linux-android29-clang $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 arm64_posix_syscall: posix_syscall.c
-	aarch64-linux-gnu-gcc -Wall -O2 -s $< -o $@
+	aarch64-linux-gnu-gcc $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 mips32el_hello: hello.c
-	mipsel-linux-gnu-gcc -Wall -O2 -s $< -o $@
+	mipsel-linux-gnu-gcc $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 mips32el_hello_static: hello.c
-	mipsel-linux-gnu-gcc -Wall -O2 -s -static $< -o $@
+	mipsel-linux-gnu-gcc $(CPPFLAGS) $(CFLAGS) -static -o $@ $<
 
 mips32el_posix_syscall: posix_syscall.c
-	mipsel-linux-gnu-gcc -Wall -O2 -s $< -o $@ 
+	mipsel-linux-gnu-gcc $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 x86_hello: hello.c
-	gcc -Wall -O2 -s -m32 $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -m32 -o $@ $<
 
 x86_hello_static: hello.c
-	gcc -Wall -O2 -s -m32 -static $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -m32 -static -o $@ $<
+
+x86_hello_cpp: hello.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -m32 -o $@ $<
+
+x86_hello_cpp_static: hello.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -m32 -static -o $@ $<
 
 x86_posix_syscall: posix_syscall.c
-	gcc -Wall -O2 -s -m32 $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -m32 -o $@ $<
 
 x86_fetch_urandom: fetch_urandom.c
-	gcc -Wall -O2 -s -m32 $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -m32 -o $@ $<
 
 x8664_hello: hello.c
-	gcc -Wall -O2 -s $< -o $@
+	$(CC) $(CFLAGS) -m64 -o $@ $<
 
 x8664_hello_static: hello.c
-	gcc -Wall -O2 -s -static $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -m64 -static -o $@ $<
 
-libpatch_test.so: patch_test.so.h patch_test.so.c
-	gcc -shared -fpic -s patch_test.so.c -o $@
+x8664_hello_cpp: hello.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -m64 -o $@ $<
 
-patch_test.bin: libpatch_test.so patch_test.bin.c
-	gcc -s patch_test.bin.c libpatch_test.so -o $@
+x8664_hello_cpp_static: hello.cpp
+	$(CXX) $(CXXFLAGS) -m64 -static -o $@ $<
+
+libpatch_test.so: patch_test.so.h patch_test.so.c
+	$(CC) $(CPPFLAGS) -Wall -s -O0 -shared -fpic -o $@ patch_test.so.c
 
+patch_test.bin: patch_test.bin.c libpatch_test.so
+	$(CC) $(CPPFLAGS) $(CFLAGS) -Wno-nonnull -o $@ $^
 
 $(OBJS):%.o:%.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
 clean:
-	rm -f *.d *.s *.o $(TARGET)
+	$(RM) -f *.d *.s *.o *.so $(TARGETS)