summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2013-12-03 14:11:43 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2013-12-03 14:11:43 -0800
commit66cff2e98d5eb3aac96f586f2fa882b803dbebd0 (patch)
tree47b77fe8645653decb21acd83999d5f9cb744a49
parent21339843186a3aecd5f9e06fae12a5b255dfbc12 (diff)
downloadinfinitytier-66cff2e98d5eb3aac96f586f2fa882b803dbebd0.tar.gz
infinitytier-66cff2e98d5eb3aac96f586f2fa882b803dbebd0.zip
Create common Makefile that automatically loads make rules on a per-OS basis.
-rwxr-xr-x.gitignore1
-rw-r--r--Makefile11
-rw-r--r--make-linux.mk (renamed from Makefile.linux)0
-rw-r--r--make-mac.mk (renamed from Makefile.mac)0
4 files changed, 11 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 2fb0a651..1cdc1ba8 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
/zerotier-*
/build-ZeroTierUI-*
/ZeroTierUI/*.user
-/Makefile
*.o
.DS_Store
.Apple*
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..ac50884c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+# Common makefile -- loads make rules for each platform
+
+OSTYPE=$(shell uname -s)
+
+ifeq ($(OSTYPE),Darwin)
+ include make-mac.mk
+endif
+
+ifeq ($(OSTYPE),Linux)
+ include make-linux.mk
+endif
diff --git a/Makefile.linux b/make-linux.mk
index a432d912..a432d912 100644
--- a/Makefile.linux
+++ b/make-linux.mk
diff --git a/Makefile.mac b/make-mac.mk
index f0f56810..f0f56810 100644
--- a/Makefile.mac
+++ b/make-mac.mk