aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranklin Wei <git@fwei.tk>2016-01-26 20:13:46 -0500
committerFranklin Wei <git@fwei.tk>2016-01-26 20:13:46 -0500
commita5492d96ff683f11537b3c97d752184f3d1b3c0b (patch)
tree5315466e0479b40cb715a9b36e43bd39ed1205d2
parent3b8df7146fe31518080f3a38eee98222d97ee5b2 (diff)
downloadnetcosm-a5492d96ff683f11537b3c97d752184f3d1b3c0b.zip
netcosm-a5492d96ff683f11537b3c97d752184f3d1b3c0b.tar.gz
netcosm-a5492d96ff683f11537b3c97d752184f3d1b3c0b.tar.bz2
netcosm-a5492d96ff683f11537b3c97d752184f3d1b3c0b.tar.xz
try and fix travis yet again, prettify makefile
-rw-r--r--.travis.yml2
-rw-r--r--Makefile26
2 files changed, 27 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index a62ee1d..90add70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,5 +5,5 @@ before-install:
- sudo apt-get install -y libbsd libev
- uname -a
install:
- - make
+ - make --debug
- ./build/unix.bin &
diff --git a/Makefile b/Makefile
index f8d92db..b7fc042 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,26 @@
+################################################################################
+#
+# NetCosm - a MUD server
+# Copyright (C) 2016 Franklin Wei
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+
+# Definitions
+################################################################################
+
CC = cc
BUILDDIR = build
PLATFORM = unix
@@ -22,6 +45,7 @@ HEADERS = src/*.h export/include/*.h
DEPS = $(patsubst %.c,$(BUILDDIR)/%.d,$(SRC))
+# Main targets
################################################################################
.PHONY: all
@@ -41,6 +65,7 @@ $(BUILDDIR)/%.o: %.c $(BUILDDIR)/%.d Makefile
@mkdir -p `dirname $@`
@$(CC) -c $< $(CFLAGS) -o $@
+# Dependencies
################################################################################
.PRECIOUS: $(BUILDDIR)/%.d
@@ -50,6 +75,7 @@ $(BUILDDIR)/%.d: %.c
-include $(DEPS)
+# Helper targets
################################################################################
.PHONY: setcap