From 5ea2f92d90210c2f6254b216aa4863635d3ae645 Mon Sep 17 00:00:00 2001
From: Lucas Werkmeister <mail@lucaswerkmeister.de>
Date: Fri, 9 Sep 2016 22:19:31 +0200
Subject: [PATCH] upd: native Makefile improvements

- Remove optimization. We don't need it, and -O3 in particular can
  introduce bugs.
- Move -I directives to preprocessor flags.
- Add a separate goal for the header file instead of using shell &&.
- Use the special variable $(RM) to remove files, and ignore failures if
  some files don't exist.

Change-Id: Icb7bd684bae6bdb860712a4e24d880b265db292a
---
 natives/Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/natives/Makefile b/natives/Makefile
index 3fbf922b..4fa62a79 100644
--- a/natives/Makefile
+++ b/natives/Makefile
@@ -2,17 +2,18 @@ JAVA_HOME=/usr/lib/jvm/default-java
 SYSTEM= $(shell uname | awk '{print tolower($$0)}')
 JAVAH=javah
 CC=gcc
-CFLAGS=-O3 -g -flto -Wall -Werror -Wextra -pedantic -fPIC
-CFLAGS+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(SYSTEM)
+CFLAGS=-flto -Wall -Werror -Wextra -pedantic -fPIC
+CPPFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(SYSTEM)
 LDFLAGS=-shared
 
 
 all: libsetuid.so
 
-libsetuid.so: org_cacert_gigi_natives_SetUID.c
-	$(JAVAH) -classpath ../bin/ -jni org.cacert.gigi.natives.SetUID && \
-	$(CC) $(CFLAGS) $(LDFLAGS) -o libsetuid.so org_cacert_gigi_natives_SetUID.c
+org_cacert_gigi_natives_SetUID.h: ../src/org/cacert/gigi/natives/SetUID.java
+	$(JAVAH) -classpath ../bin/ -jni org.cacert.gigi.natives.SetUID
+
+libsetuid.so: org_cacert_gigi_natives_SetUID.c org_cacert_gigi_natives_SetUID.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
 clean:
-	rm -f *.so
-	rm -f *.h
+	-$(RM) *.so *.h
-- 
2.39.2