summaryrefslogtreecommitdiff
path: root/src/webserver
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2010-05-05 07:34:05 -0400
committerMadCamel <madcamel@gmail.com>2010-05-05 07:34:05 -0400
commit51e87379c9d532cafc98b96178709b8b8c88e1ae (patch)
treedb80f2e1a758b2739ab79218a88a3def501f362d /src/webserver
parentae73f3122063048b3a5a2d1c48f6c13b02fd4e1f (diff)
downloadtmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.gz
tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.bz2
tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.xz
tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.zip
Fixed up and slightly simplified the build system
It's now possible to run 'make' in any of the src/ subdirs and have it build properly. Moved some tools including eathena-monitor to src/tools - run 'make tools' to build. CFLAGS, etc are now in the 'make.defs' file. Requires GNU make.
Diffstat (limited to 'src/webserver')
-rw-r--r--src/webserver/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/webserver/Makefile b/src/webserver/Makefile
index 065c1ff..417fa7c 100644
--- a/src/webserver/Makefile
+++ b/src/webserver/Makefile
@@ -1,19 +1,19 @@
-cc = gcc
+include ../../make.defs
all:
#Generate framework...
- $(cc) -c parse.c
- $(cc) -c generate.c
- $(cc) -c htmlstyle.c
- $(cc) -c logs.c
+ $(CC) $(CFLAGS) -c parse.c
+ $(CC) $(CFLAGS) -c generate.c
+ $(CC) $(CFLAGS) -c htmlstyle.c
+ $(CC) $(CFLAGS) -c logs.c
#Generate "pages"...
- cd pages && $(cc) -c about.c && cd ..
- cd pages && $(cc) -c sample.c && cd ..
- cd pages && $(cc) -c notdone.c && cd ..
+ cd pages && $(CC) $(CFLAGS) -c about.c && cd ..
+ cd pages && $(CC) $(CFLAGS) -c sample.c && cd ..
+ cd pages && $(CC) $(CFLAGS) -c notdone.c && cd ..
#Building the server...
- $(cc) -o webserver main.c parse.o generate.o htmlstyle.o \
+ $(CC) $(CFLAGS) -o webserver main.c parse.o generate.o htmlstyle.o \
logs.o pages/about.o pages/sample.o pages/notdone.o