From: Patrik Gornicz Date: Tue, 23 Jun 2009 00:48:04 +0000 (-0400) Subject: make: created global directory names X-Git-Tag: libbear-premerge~42 X-Git-Url: http://gitweb.pgornicz.com/?a=commitdiff_plain;h=75c4965c225abb550e5390f266f5696378930480;p=libbear.git make: created global directory names --- diff --git a/lib/dir.mk b/lib/dir.mk index 70d24f1..546e3aa 100644 --- a/lib/dir.mk +++ b/lib/dir.mk @@ -23,7 +23,7 @@ ${L_BLDDIRS_$P}: | $${@D} L_BLDDIRS_$P += ${OBJSDIR_$P} L_BLDDIRS_$P += ${DEPSDIR_$P} -L_BLDDIRS_$P += ${WORKINGDIR_$P} +L_BLDDIRS_$P += ${BINDIR_$P} L_DEPS += ${L_DEPS_$P} L_BLDDIRS += ${L_BLDDIRS_$P} diff --git a/lib/rules.mk b/lib/rules.mk index 9827990..d2ca455 100644 --- a/lib/rules.mk +++ b/lib/rules.mk @@ -5,7 +5,7 @@ install: ${INSTALL} -t ${includedir}/bear inc/* ln -sfn ${REALNAME} ${libdir}/${LINKERNAME} ln -sfn ${REALNAME} ${libdir}/${SONAME} - ${INSTALL} -t ${libdir} ${WORKINGDIR}${REALNAME} + ${INSTALL} -t ${libdir} ${BINDIR}${REALNAME} # HACK uninstall uninstall: @@ -43,8 +43,8 @@ L_CLEANCMDS += cleanbin-$P cleanbin: cleanbin-$P .PHONY: cleanbin-$P cleanbin-$P: - ${Q1}${PRNTFMT} "rm" "${WORKINGDIR}" - ${Q2}rm -rf ${WORKINGDIR} + ${Q1}${PRNTFMT} "rm" "${BINDIR}" + ${Q2}rm -rf ${BINDIR} L_CLEANCMDS += cleanobjs-$P cleanobjs: cleanobjs-$P diff --git a/lib/tvars.mk b/lib/tvars.mk index bd66535..3a37c57 100644 --- a/lib/tvars.mk +++ b/lib/tvars.mk @@ -11,7 +11,7 @@ ${TARGETTMP_$P}: CXXFLAGS := ${CXXFLAGS_$P} ${TARGETTMP_$P}: LNKFLAGS := ${LNKFLAGS_$P} ${TARGETTMP_$P}: LIBS := ${LIBS_$P} -cleanbin-$P: WORKINGDIR := ${WORKINGDIR_$P} +cleanbin-$P: BINDIR := ${BINDIR_$P} cleanobjs-$P: OBJSDIR := ${OBJSDIR_$P} cleandeps-$P: DEPSDIR := ${DEPSDIR_$P} diff --git a/lib/vars.mk b/lib/vars.mk index 9c851a9..167c333 100644 --- a/lib/vars.mk +++ b/lib/vars.mk @@ -16,8 +16,11 @@ CXX_$P := ${G_CXX} CXXFLAGS_$P := ${G_CXXFLAGS} -fPIC LIBS_$P := ${G_LIBSDL} ${G_LIBGL} -SRCSDIR_$P := ${CURDIR}src/ -DEPSDIR_$P := ${CURDIR}deps/ +SRCSDIR_$P := ${CURDIR}${G_SRCSDIR} +DEPSDIR_$P := ${CURDIR}${G_DEPSDIR} +OBJSDIR_$P := ${CURDIR}${G_OBJSDIR} +BINDIR_$P := ${CURDIR}${G_BINDIR} + T_INCDIRS_$P := ${SRCSDIR_$P} ${CURDIR}inc/ INCFLAGS_$P := $(addprefix -I, ${T_INCDIRS_$P}) @@ -25,27 +28,6 @@ T_INCDIRS_$P := ifeq (${BUILD},WIN32) - OBJSDIR_$P := ${CURDIR}objs-mingw32/ -else -ifeq (${BUILD},FINAL) - OBJSDIR_$P := ${CURDIR}objs/ -else - OBJSDIR_$P := ${CURDIR}objsd/ -endif -endif - -ifeq (${BUILD},WIN32) - WORKINGDIR_$P := ${CURDIR}bin-mingw32/ -else -ifeq (${BUILD},FINAL) - WORKINGDIR_$P := ${CURDIR}bin/ -else - WORKINGDIR_$P := ${CURDIR}bind/ -endif -endif - - -ifeq (${BUILD},WIN32) LINKERNAME_$P := bear.dll SONAME_$P := bear.dll REALNAME_$P := bear.dll diff --git a/targets.mk b/targets.mk index 90e8b6c..d31779b 100644 --- a/targets.mk +++ b/targets.mk @@ -8,7 +8,7 @@ G_OBJS_LIB := objs-${G_LIB} G_DEPS_LIB := deps-${G_LIB} .PHONY: ${G_DEPS_LIB} -TARGET_${G_LIB} := ${WORKINGDIR_${G_LIB}}${REALNAME_${G_LIB}} +TARGET_${G_LIB} := ${BINDIR_${G_LIB}}${REALNAME_${G_LIB}} G_TESTS := ${P_TESTS} diff --git a/tests/dir.mk b/tests/dir.mk index 5b4c6be..1e50bd8 100644 --- a/tests/dir.mk +++ b/tests/dir.mk @@ -25,7 +25,7 @@ ${L_BLDDIRS_$P}: | $${@D} L_BLDDIRS_$P += ${OBJSDIR_$P} L_BLDDIRS_$P += ${DEPSDIR_$P} -L_BLDDIRS_$P += ${WORKINGDIR_$P} +L_BLDDIRS_$P += ${BINDIR_$P} L_DEPS += ${L_DEPS_$P} L_BLDDIRS += ${L_BLDDIRS_$P} diff --git a/tests/rules.mk b/tests/rules.mk index 303c0ca..617f251 100644 --- a/tests/rules.mk +++ b/tests/rules.mk @@ -3,7 +3,7 @@ ${G_OBJS_TESTS}: ${L_OBJS_$P} ${G_DEPS_TESTS}: ${L_DEPS_$P} # how to copy a library to the tests bin directory -${WORKINGDIR_$P}${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${@D} +${BINDIR_$P}${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${@D} ${cmd-cp} # rule to make an object file from a .cpp @@ -21,8 +21,8 @@ L_CLEANCMDS += cleanbin-$P cleanbin: cleanbin-$P .PHONY: cleanbin-$P cleanbin-$P: - ${Q1}${PRNTFMT} "rm" "${WORKINGDIR}" - ${Q2}rm -rf ${WORKINGDIR} + ${Q1}${PRNTFMT} "rm" "${BINDIR}" + ${Q2}rm -rf ${BINDIR} L_CLEANCMDS += cleanobjs-$P cleanobjs: cleanobjs-$P diff --git a/tests/src/1/rules.mk b/tests/src/1/rules.mk index f32fe5f..f72f3ee 100644 --- a/tests/src/1/rules.mk +++ b/tests/src/1/rules.mk @@ -3,7 +3,7 @@ ${G_TESTS}: ${TARGET_$D} ${G_TESTS}-${DIRNAME}: ${TARGET_$D} # this test depends on the G_LIB library -${TARGETTMP_$D}: ${WORKINGDIR_$P}${SONAME_${G_LIB}} +${TARGETTMP_$D}: ${BINDIR_$P}${SONAME_${G_LIB}} # how to link the main target ${TARGETTMP_$D}: ${L_OBJS_$D} | $${@D} diff --git a/tests/src/1/vars.mk b/tests/src/1/vars.mk index 3cb7783..3e2e1b7 100644 --- a/tests/src/1/vars.mk +++ b/tests/src/1/vars.mk @@ -4,7 +4,7 @@ CXXFLAGS_$D := ${CXXFLAGS_$P} LNKFLAGS_$D := ${LNKFLAGS_$P} LIBS_$D := ${LIBS_$P} -TARGETNAME_$D := test-1 +TARGETNAME_$D := ${TARGETPRE_$P}${DIRNAME} TARGETTMP_$D := ${OBJSDIR_$P}${TARGETNAME_$D} -TARGET_$D := ${WORKINGDIR_$P}${TARGETNAME_$D} +TARGET_$D := ${BINDIR_$P}${TARGETNAME_$D} diff --git a/tests/src/printTrace/rules.mk b/tests/src/printTrace/rules.mk index f32fe5f..f72f3ee 100644 --- a/tests/src/printTrace/rules.mk +++ b/tests/src/printTrace/rules.mk @@ -3,7 +3,7 @@ ${G_TESTS}: ${TARGET_$D} ${G_TESTS}-${DIRNAME}: ${TARGET_$D} # this test depends on the G_LIB library -${TARGETTMP_$D}: ${WORKINGDIR_$P}${SONAME_${G_LIB}} +${TARGETTMP_$D}: ${BINDIR_$P}${SONAME_${G_LIB}} # how to link the main target ${TARGETTMP_$D}: ${L_OBJS_$D} | $${@D} diff --git a/tests/src/printTrace/vars.mk b/tests/src/printTrace/vars.mk index 734d98b..3e2e1b7 100644 --- a/tests/src/printTrace/vars.mk +++ b/tests/src/printTrace/vars.mk @@ -4,7 +4,7 @@ CXXFLAGS_$D := ${CXXFLAGS_$P} LNKFLAGS_$D := ${LNKFLAGS_$P} LIBS_$D := ${LIBS_$P} -TARGETNAME_$D := test-printTrace +TARGETNAME_$D := ${TARGETPRE_$P}${DIRNAME} TARGETTMP_$D := ${OBJSDIR_$P}${TARGETNAME_$D} -TARGET_$D := ${WORKINGDIR_$P}${TARGETNAME_$D} +TARGET_$D := ${BINDIR_$P}${TARGETNAME_$D} diff --git a/tests/tvars.mk b/tests/tvars.mk index a062b30..59015c1 100644 --- a/tests/tvars.mk +++ b/tests/tvars.mk @@ -5,7 +5,7 @@ ${L_OBJS_$P} ${L_DEPS_$P}: INCFLAGS := ${INCFLAGS_$P} ${L_DEPS_$P}: DEPSDIR := ${DEPSDIR_$P} ${L_DEPS_$P}: OBJSDIR := ${OBJSDIR_$P} -cleanbin-$P: WORKINGDIR := ${WORKINGDIR_$P} +cleanbin-$P: BINDIR := ${BINDIR_$P} cleanobjs-$P: OBJSDIR := ${OBJSDIR_$P} cleandeps-$P: DEPSDIR := ${DEPSDIR_$P} diff --git a/tests/vars.mk b/tests/vars.mk index 2b47ca9..b52d8c7 100644 --- a/tests/vars.mk +++ b/tests/vars.mk @@ -4,31 +4,15 @@ CXXFLAGS_$P := ${G_CXXFLAGS} LNKFLAGS_$P := ${G_LNKFLAGS} -Wl,-rpath,./ -rdynamic LIBS_$P := ${G_LIBSDL} ${G_LIBGL} +SRCSDIR_$P := ${CURDIR}${G_SRCSDIR} +DEPSDIR_$P := ${CURDIR}${G_DEPSDIR} +OBJSDIR_$P := ${CURDIR}${G_OBJSDIR} +BINDIR_$P := ${CURDIR}${G_BINDIR} + +# HACK T_INCDIRS_$P := lib/inc/ INCFLAGS_$P := $(addprefix -I, ${T_INCDIRS_$P}) T_INCDIRS_$P := # empty - -SRCSDIR_$P := ${CURDIR}src/ -DEPSDIR_$P := ${CURDIR}deps/ - -ifeq (${BUILD},WIN32) - OBJSDIR_$P := ${CURDIR}objs-mingw32/ -else -ifeq (${BUILD},FINAL) - OBJSDIR_$P := ${CURDIR}objs/ -else - OBJSDIR_$P := ${CURDIR}objsd/ -endif -endif - -ifeq (${BUILD},WIN32) - WORKINGDIR_$P := ${CURDIR}bin-mingw32/ -else -ifeq (${BUILD},FINAL) - WORKINGDIR_$P := ${CURDIR}bin/ -else - WORKINGDIR_$P := ${CURDIR}bind/ -endif -endif +TARGETPRE_$P := test- diff --git a/vars.mk b/vars.mk index b1fc660..f32cc85 100644 --- a/vars.mk +++ b/vars.mk @@ -37,6 +37,22 @@ else G_LIBSDL := `sdl-config --libs` endif +G_SRCSDIR := src/ +G_DEPSDIR := deps/ + +ifeq (${BUILD},WIN32) + G_OBJSDIR := objs-mingw32/ + G_BINDIR := bin-mingw32/ +else +ifeq (${BUILD},FINAL) + G_OBJSDIR := objs/ + G_BINDIR := bin/ +else + G_OBJSDIR := objsd/ + G_BINDIR := bind/ +endif +endif + ifeq (${BUILD},WIN32) PRNTFMT := printf "%-12s: %s\n"