projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the local libraries found in libs are now used
[physics.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
9deb3c6
..
f7e490d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,19
+1,22
@@
-LIBGL := -lGL -lGLU
-LIBSDL := `sdl-config --libs`
-LIBS := ${LIBSDL} ${LIBGL} -lpg
+LIBGL
:= -lGL -lGLU
+LIBSDL
:= `sdl-config --libs`
+LIBS
:= ${LIBSDL} ${LIBGL} -lpg
OPTFLAGS := -O2
DBGFLAGS := -ggdb
PRFFLAGS := ${DBGFLAGS} -pg
MYFLAGS := -Wall -pedantic -ansi
OPTFLAGS := -O2
DBGFLAGS := -ggdb
PRFFLAGS := ${DBGFLAGS} -pg
MYFLAGS := -Wall -pedantic -ansi
+RPATH := libs/
+
VALFLAGS := --leak-check=full
CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
VALFLAGS := --leak-check=full
CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
+LNKFLAGS := -Wl,-rpath,${RPATH}
-CXX := g++
+CXX
:= g++
-DIRS := # := start
+DIRS
:= # := start
SRCSDIR := src/
SRCS := # := start
SRCSDIR := src/
SRCS := # := start
@@
-38,8
+41,9
@@
CFGS := # := start
CFGS += keys.cfg
CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
CFGS += keys.cfg
CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
-SRCLIBSDIR := libs/
-DSTLIBSDIR := ${WORKINGDIR}
+LIBSDIRNAME := libs/
+SRCLIBSDIR := ${LIBSDIRNAME}
+DSTLIBSDIR := ${WORKINGDIR}${LIBSDIRNAME}
LIBSTXT := # := start
LIBSTXT += COPYING-SDL
LIBSTXT := # := start
LIBSTXT += COPYING-SDL
@@
-48,7
+52,8
@@
LIBSTXT += VERSION-SDL
LIBSTXT := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
LIBSCPY := # := start
LIBSTXT := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
LIBSCPY := # := start
-LIBSCPY += libSDL.so
+LIBSCPY += libSDL-1.2.so.0
+LIBSCPY += libpg.so.0
LIBSCPY := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
SRCTXTDIR :=
LIBSCPY := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
SRCTXTDIR :=
@@
-64,7
+69,13
@@
TARGET := ${WORKINGDIR}${TARGETNAME}
DEPSBLDDIRS := ${DEPSDIR} $(addprefix ${DEPSDIR},${DIRS})
OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
DEPSBLDDIRS := ${DEPSDIR} $(addprefix ${DEPSDIR},${DIRS})
OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
-BLDDIRS := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
+
+BLDDIRS := # := start
+BLDDIRS += ${OBJSBLDDIRS}
+BLDDIRS += ${DEPSBLDDIRS}
+BLDDIRS += ${WORKINGDIR}
+BLDDIRS += ${DSTCFGDIR}
+BLDDIRS += ${DSTLIBSDIR}
INCDIRS := ${SRCSDIR}
INCFLAGS := $(addprefix -I, ${INCDIRS})
INCDIRS := ${SRCSDIR}
INCFLAGS := $(addprefix -I, ${INCDIRS})
@@
-95,7
+106,7
@@
all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY} ${TXT}
# how to link the main target
${TARGETTMP}: ${OBJS}
${Q1}${PRNTFMT} "${CXX}" "$@"
# how to link the main target
${TARGETTMP}: ${OBJS}
${Q1}${PRNTFMT} "${CXX}" "$@"
- ${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
+ ${Q2}${CXX} ${CXXFLAGS}
${LNKFLAGS}
-o $@ $^ ${LIBS}
# rule to copy tmp target to working directory
${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
# rule to copy tmp target to working directory
${TARGET}: ${TARGETTMP} | ${WORKINGDIR}