cleaned the make file, regrouped varibles

diff --git a/Makefile b/Makefile
index 92ae7d2..55319a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,42 +3,9 @@
 BUILD    := DEBUG
 
 
-ifeq (${BUILD},WIN32)
-    LIBGL   := -lopengl32 -lglu32
-    LIBSDL  := `/usr/mingw32/bin/sdl-config --libs`
-else
-    LIBGL   := -lGL -lGLU
-    LIBSDL  := `sdl-config --libs`
-endif
-LIBS        := ${LIBSDL} ${LIBGL}
-
-OPTFLAGS := -O2
-DBGFLAGS := -ggdb
-PRFFLAGS := ${DBGFLAGS} -pg
-LIBFLAGS := -fPIC
-MYFLAGS  := -Wall -pedantic -ansi
-
-CXXFLAGS := ${MYFLAGS} ${LIBFLAGS}
-ifeq (${BUILD},WIN32)
-    CXXFLAGS    += ${OPTFLAGS}
-else
-ifeq (${BUILD},FINAL)
-    CXXFLAGS    += ${OPTFLAGS}
-else
-    CXXFLAGS    += ${DBGFLAGS}
-endif
-endif
-
-ifeq (${BUILD},WIN32)
-    CXX := mingw32-g++
-else
-    CXX := g++
-endif
-
-DIRS    := # := start
-
 SRCSDIR := src/
-SRCS    := # := start
+DEPSDIR := deps/
+INCDIRS := ${SRCSDIR} inc/
 
 ifeq (${BUILD},WIN32)
     OBJSDIR := objs-mingw32/
@@ -49,14 +16,6 @@ else
     OBJSDIR := objsd/
 endif
 endif
-OBJS        := # := start
-
-DEPSDIR := deps/
-DEPS    := # := start
-
-# include all of the dir.mk
-DIRMK   := dir.mk
-include ${SRCSDIR}${DIRMK}
 
 ifeq (${BUILD},WIN32)
     WORKINGDIR  := bin-mingw32/
@@ -68,6 +27,17 @@ else
 endif
 endif
 
+
+ifeq (${BUILD},WIN32)
+    LIBGL   := -lopengl32 -lglu32
+    LIBSDL  := `/usr/mingw32/bin/sdl-config --libs`
+else
+    LIBGL   := -lGL -lGLU
+    LIBSDL  := `sdl-config --libs`
+endif
+LIBS        := ${LIBSDL} ${LIBGL}
+
+
 ifeq (${BUILD},WIN32)
     LINKERNAME  := pg.dll
     SONAME      := pg.dll
@@ -78,21 +48,35 @@ else
     REALNAME    := libpg.so.0.0
 endif
 
-LNKFLAGS := -shared -Wl,-soname,${SONAME}
-
 TARGETTMP   := ${OBJSDIR}${REALNAME}
 TARGET      := ${WORKINGDIR}${REALNAME}
 
-DEPSBLDDIRS := ${DEPSDIR} $(addprefix ${DEPSDIR},${DIRS})
-OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
 
-BLDDIRS     := # := start
-BLDDIRS     += ${OBJSBLDDIRS}
-BLDDIRS     += ${DEPSBLDDIRS}
-BLDDIRS     += ${WORKINGDIR}
+OPTFLAGS := -O2
+DBGFLAGS := -ggdb
+PRFFLAGS := ${DBGFLAGS} -pg
+LIBFLAGS := -fPIC
+MYFLAGS  := -Wall -pedantic -ansi
+INCFLAGS := $(addprefix -I, ${INCDIRS})
+LNKFLAGS := -shared -Wl,-soname,${SONAME}
+
+CXXFLAGS := ${MYFLAGS} ${LIBFLAGS}
+ifeq (${BUILD},WIN32)
+    CXXFLAGS    += ${OPTFLAGS}
+else
+ifeq (${BUILD},FINAL)
+    CXXFLAGS    += ${OPTFLAGS}
+else
+    CXXFLAGS    += ${DBGFLAGS}
+endif
+endif
+
+ifeq (${BUILD},WIN32)
+    CXX := mingw32-g++
+else
+    CXX := g++
+endif
 
-INCDIRS     := ${SRCSDIR} inc/
-INCFLAGS    := $(addprefix -I, ${INCDIRS})
 
 
 ifeq (${BUILD},WIN32)
@@ -124,6 +108,25 @@ else
     Q2 :=
 endif
 
+
+# include all of the dir.mk
+DIRS    := # := start
+SRCS    := # := start
+OBJS    := # := start
+DEPS    := # := start
+DIRMK   := dir.mk
+include ${SRCSDIR}${DIRMK}
+
+
+DEPSBLDDIRS := ${DEPSDIR} $(addprefix ${DEPSDIR},${DIRS})
+OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
+
+BLDDIRS     := # := start
+BLDDIRS     += ${OBJSBLDDIRS}
+BLDDIRS     += ${DEPSBLDDIRS}
+BLDDIRS     += ${WORKINGDIR}
+
+
 .PHONY: all
 all: ${TARGET}