From 51e87379c9d532cafc98b96178709b8b8c88e1ae Mon Sep 17 00:00:00 2001 From: MadCamel Date: Wed, 5 May 2010 07:34:05 -0400 Subject: 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. --- src/webserver/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/webserver') 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 -- cgit v1.2.3-70-g09d2