Makefile cleanup. Tested on Ubuntu Linux.

Store executable names in make vars so that the clean target works.
Eliminate 'all' target; this target does not work and does not make
sense since each target is compiled with different settings.

Author: chrismaeda

SRC/Makefile

@@ -1,67 +1,77 @@
-.PHONY = all clean binary server debugserver standalone pgserver debugpgserver mongoserver debugmongoserver foreignserver mongotreetaggerserver 
+.PHONY = clean binary server debugserver standalone pgserver debugpgserver mongoserver debugmongoserver foreignserver mongotreetaggerserver 
 
+# store executable names in make variables so that clean target works
 
+executable.server=../BINARIES/ChatScript
 server: DEFINES+= -DLOCKUSERFILE=1  -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1 
 server: PGLOAD= -pthread
 server: INCLUDEDIRS=-Ievserver
-server: all
-server: EXECUTABLE=../BINARIES/ChatScript
+server: binary
+server: EXECUTABLE=$(executable.server)
 server: CFLAGS=-c  -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
+executable.debugserver=../BINARIES/ChatScriptDebug
 debugserver: DEFINES+= -DLOCKUSERFILE=1 -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1  -DDEBUG -DEVSERVER=1 -DEVSERVER_FORK=1 
 debugserver: PGLOAD= -pthread
 debugserver: INCLUDEDIRS=-Ievserver
-debugserver: all
-debugserver: EXECUTABLE=../BINARIES/ChatScriptDebug
+debugserver: binary
+debugserver: EXECUTABLE=$(executable.debugserver)
 debugserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
 
+executable.standalone=../BINARIES/ChatScript
 standalone: DEFINES+=  -DDISCARDSERVER=1 -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1 -DEVSERVER=1 -DEVSERVER_FORK=1
 standalone: PGLOAD= -pthread
 standalone: INCLUDEDIRS=-Ievserver
-standalone: all
-standalone: EXECUTABLE=../BINARIES/ChatScript
+standalone: binary
+standalone: EXECUTABLE=$(executable.standalone)
 standalone: CFLAGS=-c -std=c++11  -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
+executable.pgserver=../BINARIES/ChatScriptpg
 pgserver: DEFINES+= -DLOCKUSERFILE=1 -DEVSERVER=1 -DEVSERVER_FORK=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1
 pgserver: PGLOAD= -lpq -pthread
-pgserver: all
-pgserver: EXECUTABLE=../BINARIES/ChatScriptpg
+pgserver: binary
+pgserver: EXECUTABLE=$(executable.pgserver)
 pgserver: INCLUDEDIRS=-Ievserver -Ipostgres
 pgserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
+executable.debugpgserver=../BINARIES/ChatScriptpgDebug
 debugpgserver: DEFINES+= -DLOCKUSERFILE=1  -DDEBUG -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDMONGO=1  
 debugpgserver: PGLOAD= -lpq -pthread
 debugpgserver: INCLUDEDIRS=-Ievserver
-debugpgserver: all
-debugpgserver: EXECUTABLE=../BINARIES/ChatScriptpgDebug
+debugpgserver: binary
+debugpgserver: EXECUTABLE=$(executable.debugpgserver)
 debugpgserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
 
+executable.mongoserver=../BINARIES/ChatScriptMongo
 mongoserver: DEFINES+= -DLOCKUSERFILE=1 -DEVSERVER=1 -DEVSERVER_FORK=1 -DDISCARDPOSTGRES=1 -DDISCARDMYSQL=1
 mongoserver: PGLOAD= -pthread
-mongoserver: all
-mongoserver: EXECUTABLE=../BINARIES/ChatScriptMongo
+mongoserver: binary
+mongoserver: EXECUTABLE=$(executable.mongoserver)
 mongoserver: INCLUDEDIRS=-Iinclude -I/usr/local/include/libbson-1.0 -I/usr/local/include/libmongoc-1.0
 mongoserver: CFLAGS=-c -std=c++11  -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
 
+executable.debugmongoserver=../BINARIES/ChatScriptMongoDebug
 debugmongoserver: DEFINES+= -DLOCKUSERFILE=1  -DDEBUG -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDPOSTGRES=1  -DDISCARDMYSQL=1
 debugmongoserver: PGLOAD= -lpq -pthread
-debugmongoserver: all
+debugmongoserver: binary
 debugmongoserver: INCLUDEDIRS=-Iinclude -I/usr/local/include/libbson-1.0 -I/usr/local/include/libmongoc-1.0
-debugmongoserver: EXECUTABLE=../BINARIES/ChatScriptMongoDebug
+debugmongoserver: EXECUTABLE=$(executable.debugmongoserver)
 debugmongoserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
 
+executable.foreignserver=../BINARIES/ChatScriptForeign
 foreignserver: DEFINES+= -DLOCKUSERFILE=1  -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1 -DTREETAGGER=1
 foreignserver: PGLOAD= -pthread -L../treetagger -L../BINARIES -ltreetagger
 foreignserver: INCLUDEDIRS=-Ievserver
-foreignserver: all
-foreignserver: EXECUTABLE=../BINARIES/ChatScriptForeign
+foreignserver: binary
+foreignserver: EXECUTABLE=$(executable.foreignserver)
 foreignserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
+executable.mongotreetaggerserver=../BINARIES/ChatScriptMongoForeign
 mongotreetaggerserver: DEFINES+= -DLOCKUSERFILE=1  -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDPOSTGRES=1  -DDISCARDMYSQL=1 -DTREETAGGER=1
 mongotreetaggerserver: PGLOAD= -pthread -L../treetagger -L../BINARIES -ltreetagger
 mongotreetaggerserver: INCLUDEDIRS=-Iinclude -I/usr/local/include/libbson-1.0 -I/usr/local/include/libmongoc-1.0
-mongotreetaggerserver: all
-mongotreetaggerserver: EXECUTABLE=../BINARIES/ChatScriptMongoForeign
+mongotreetaggerserver: binary
+mongotreetaggerserver: EXECUTABLE=$(executable.mongotreetaggerserver)
 mongotreetaggerserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
 UNAME := $(shell uname)
@@ -95,13 +105,23 @@ endif
 
 SOURCES=constructCode.cpp duktape/duktape.c evserver.cpp csocket.cpp cs_ev.c dictionarySystem.cpp englishTagger.cpp factSystem.cpp json.cpp functionExecute.cpp english.cpp infer.cpp javascript.cpp jsmn.cpp markSystem.cpp mongodb.cpp os.cpp outputSystem.cpp patternSystem.cpp postgres.cpp privatesrc.cpp scriptCompile.cpp spellcheck.cpp secure.cpp systemVariables.cpp tagger.cpp testing.cpp textUtilities.cpp tokenSystem.cpp topicSystem.cpp userCache.cpp userSystem.cpp variableSystem.cpp mainSystem.cpp 
 OBJECTS=$(SOURCES:.cpp=.o)
- 
-all: $(SOURCES) binary
+
+# all target does make sense since each build target requires a different set of defines
+# so we need to clean before building each target in order compile the right stuff
+
+default: server
 
 clean:
-	-rm -f $(EXECUTABLE)
-	-rm -f ../$(EXECUTABLE)
 	-rm -f *.o
+	-rm -f $(executable.server)
+	-rm -f $(executable.debugserver)
+	-rm -f $(executable.standalone)
+	-rm -f $(executable.pgserver)
+	-rm -f $(executable.debugpgserver)
+	-rm -f $(executable.mongoserver)
+	-rm -f $(executable.debugmongoserver)
+	-rm -f $(executable.foreignserver)
+	-rm -f $(executable.mongotreetaggerserver)
 
 binary: $(OBJECTS)
 	$(CC) $(OBJECTS) $(LDFLAGS) $(DEFINES) $(INCLUDEDIRS) -o $(EXECUTABLE)