From 7ad82d0366a352055316c0e2de22dc9abdd292a4 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Fri, 8 Feb 2013 06:31:13 +0100
Subject: corrected
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 Makefile | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 50208d9..f3068b0 100644
--- a/Makefile
+++ b/Makefile
@@ -8,20 +8,36 @@
 # [GNU All Permissive License]
 
 JAVAC=javac
+JAVADIRS=-s "pure-java" -d "bin/pure-java" -cp "pure-java"
+JAVAFLAGS=-Xlint
+JAVA_FLAGS=$(JAVADIRS) $(JAVAFLAGS)
 
+CFLAGS=-W{all,extra} -pedantic
+CPPFLAGS=
+LDFLAGS=
+C_FLAGS=$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
-JAVA_CLASSES = $(shell find "pure-java" | grep '\.java$$' | sed -e 's_^_bin/_g' -e 's_java$$_class_g')
 
+JAVA_CLASSES = $(shell find "pure-java" | grep '\.java$$' | sed -e 's_^_bin/_g' -e 's_java$$_class_g')
+C_OBJS = $(shell find "c" | grep '\.h$$' | sed -e 's_^_bin/_g' -e 's_h$$_o_g')
+C_BINS = bin/c/sha3sum
 
-all: pure-java
+all: pure-java c
 
 
 pure-java: $(JAVA_CLASSES)
 bin/pure-java/%.class: pure-java/%.java
 	mkdir -p "bin/pure-java"
-	$(JAVAC) -s "pure-java" -d "bin/pure-java" -cp "pure-java" "pure-java/$*.java"
-
-
+	$(JAVAC) $(JAVA_FLAGS) "pure-java/$*.java"
+
+c: $(C_OBJS) $(C_BINS)
+bin/c/%.o: c/%.h c/%.c
+	mkdir -p "bin/c"
+	$(CC) $(C_FLAGS) -c "c/$*".{c,h}
+	mv "$*.o" "c/$*.o"
+bin/c/%: c/%.c
+	mkdir -p "bin/c"
+	$(CC) $(C_FLAGS) -o "$@" "c/$*".c "c/"*.o
 
 
 .PHONY: clean
-- 
cgit v1.2.3-70-g09d2