From 2c1365ad0c836d9bc3ceb55ad762b63f38eb8119 Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Fri, 19 Sep 2014 03:35:51 +0000
Subject: [PATCH] * Makefile : move common targets to top-level Makefile

---
 Makefile       | 19 +++++++++++++++++++
 Makefile.bsd   | 21 ---------------------
 Makefile.linux | 21 ---------------------
 Makefile.osx   | 23 +----------------------
 4 files changed, 20 insertions(+), 64 deletions(-)

diff --git a/Makefile b/Makefile
index efce521a..9b9425b1 100644
--- a/Makefile
+++ b/Makefile
@@ -8,3 +8,22 @@ else
 	include Makefile.linux
 endif
 
+all: obj i2p
+
+i2p: $(OBJECTS:obj/%=obj/%)
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+
+.SUFFIXES:
+.SUFFIXES:	.c .cc .C .cpp .o
+
+obj/%.o : %.cpp
+	$(CC) -o $@ $< -c $(CFLAGS) $(INCFLAGS) $(CPU_FLAGS)
+
+obj:
+	mkdir -p obj
+
+clean:
+	rm -fr obj i2p
+
+.PHONY: all
+.PHONY: clean
diff --git a/Makefile.bsd b/Makefile.bsd
index be8396e6..517016ca 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -4,24 +4,3 @@ include filelist.mk
 INCFLAGS = -I/usr/include/ -I/usr/local/include/
 LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
 LIBS =
-
-all: obj i2p
-
-i2p: $(OBJECTS:obj/%=obj/%)
-	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-
-.SUFFIXES:
-.SUFFIXES:	.c .cc .C .cpp .o
-
-obj/%.o : %.cpp
-	$(CC) -o $@ $< -c $(CFLAGS) $(INCFLAGS) $(CPU_FLAGS)
-
-obj:
-	mkdir -p obj
-
-clean:
-	rm -fr obj i2p
-
-.PHONY: all
-.PHONY: clean
-
diff --git a/Makefile.linux b/Makefile.linux
index d5a0f361..a9ceb80c 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -1,4 +1,3 @@
-
 CC = g++
 CFLAGS = -g -Wall -std=c++11
 include filelist.mk
@@ -11,23 +10,3 @@ ifneq ($(shell grep -c aes /proc/cpuinfo),0)
 	CPU_FLAGS = -maes -DAESNI
 endif
 
-all: obj i2p
-
-i2p: $(OBJECTS:obj/%=obj/%)
-	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-
-.SUFFIXES:
-.SUFFIXES:	.c .cc .C .cpp .o
-
-obj/%.o : %.cpp
-	$(CC) -o $@ $< -c $(CFLAGS) $(INCFLAGS) $(CPU_FLAGS)
-
-obj:
-	mkdir -p obj
-
-clean:
-	rm -fr obj i2p
-
-.PHONY: all
-.PHONY: clean
-
diff --git a/Makefile.osx b/Makefile.osx
index 5aa22e52..fb4d5a45 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -9,30 +9,9 @@ LIBS =
 # http://www.hutsby.net/2011/08/macs-with-aes-ni.html
 # Seems like all recent Mac's have AES-NI, after firmware upgrade 2.2
 # Found no good way to detect it from command line. TODO: Might be some osx sysinfo magic
-CPU_FLAGS = -DAESNI
+CFLAGS += -DAESNI
 
 # Apple Mac OSX
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
 endif
-
-all: obj i2p
-
-i2p: $(OBJECTS:obj/%=obj/%)
-	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-
-.SUFFIXES:
-.SUFFIXES:	.c .cc .C .cpp .o
-
-obj/%.o : %.cpp
-	$(CC) -o $@ $< -c $(CFLAGS) $(INCFLAGS) $(CPU_FLAGS)
-
-obj:
-	mkdir -p obj
-
-clean:
-	rm -fr obj i2p
-
-.PHONY: all
-.PHONY: clean
-