patch Makefiles, Thanks to Lukas Fittl
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@406 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
parent
7438aec6c3
commit
f717540760
16 changed files with 164 additions and 424 deletions
|
@ -1,31 +1,11 @@
|
|||
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = Factory.o
|
||||
LINKOBJ = Factory.o
|
||||
CXXINCS = -I./../../include
|
||||
OBJ = Factory.o
|
||||
BIN = main-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
|
||||
all: all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
Factory.o: Factory.cpp
|
||||
$(CPP) -c Factory.cpp -o Factory.o $(CXXFLAGS)
|
||||
$(CXX) -o $(BIN) $(OBJ) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ) $(BIN)
|
||||
|
|
11
test/Function/Makefile
Normal file
11
test/Function/Makefile
Normal file
|
@ -0,0 +1,11 @@
|
|||
OBJ = FunctionTest.o
|
||||
BIN = main-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CXX) -o $(BIN) $(OBJ) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ) $(BIN)
|
|
@ -1,32 +1,20 @@
|
|||
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = main.o
|
||||
LINKOBJ = main.o
|
||||
CXXINCS = -I./../../include
|
||||
OBJ1 = main.o
|
||||
OBJ2 = main2.o
|
||||
BIN1 = main-gcc
|
||||
BIN2 = main2-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
.PHONY: all
|
||||
all: $(BIN1) $(BIN2)
|
||||
|
||||
all: all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
Factory.o: Factory.cpp
|
||||
$(CPP) -c main.cpp -o main.o $(CXXFLAGS)
|
||||
$(BIN1): $(OBJ1)
|
||||
$(CXX) -o $(BIN1) $(OBJ1) $(LIBS)
|
||||
|
||||
$(BIN2): $(OBJ2)
|
||||
$(CXX) -o $(BIN2) $(OBJ2) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ1) $(BIN1)
|
||||
rm -f $(OBJ2) $(BIN2)
|
||||
|
|
120
test/Makefile
120
test/Makefile
|
@ -1,110 +1,20 @@
|
|||
SUBTARGETS = Factory flex_string Longevity OrderedStatic RegressionTest \
|
||||
SafeFormat ScopeGuard Singleton SmallObj Visitor
|
||||
|
||||
MAKEFILE = Makefile
|
||||
|
||||
SUBTARGETS = \
|
||||
sub-Factory \
|
||||
sub-flex_string \
|
||||
sub-Longevity \
|
||||
sub-OrderedStatic \
|
||||
sub-RegressionTest \
|
||||
sub-SafeFormat \
|
||||
sub-ScopeGuard \
|
||||
sub-Singleton \
|
||||
sub-SmallObj \
|
||||
sub-Visitor
|
||||
|
||||
.PHONY: all $(SUBTARGETS)
|
||||
all: $(SUBTARGETS)
|
||||
|
||||
sub-Factory: FORCE
|
||||
cd Factory && \
|
||||
$(MAKE) -f $(MAKEFILE)
|
||||
@cd ..
|
||||
|
||||
sub-flex_string: FORCE
|
||||
cd flex_string && \
|
||||
$(MAKE) -f $(MAKEFILE)
|
||||
@cd ..
|
||||
$(SUBTARGETS):
|
||||
$(MAKE) -C $@
|
||||
|
||||
sub-Longevity: FORCE
|
||||
cd Longevity && \
|
||||
$(MAKE) -f $(MAKEFILE) && \
|
||||
$(MAKE) -f $(MAKEFILE)2
|
||||
@cd ..
|
||||
|
||||
sub-OrderedStatic: FORCE
|
||||
cd OrderedStatic && \
|
||||
$(MAKE) -f $(MAKEFILE)
|
||||
@cd ..
|
||||
|
||||
sub-RegressionTest: FORCE
|
||||
cd RegressionTest && \
|
||||
$(MAKE) -f $(MAKEFILE)
|
||||
@cd ..
|
||||
|
||||
sub-SafeFormat: FORCE
|
||||
cd SafeFormat && \
|
||||
$(MAKE) -f $(MAKEFILE)
|
||||
@cd ..
|
||||
|
||||
sub-ScopeGuard: FORCE
|
||||
cd ScopeGuard && \
|
||||
$(MAKE) -f $(MAKEFILE)
|
||||
@cd ..
|
||||
|
||||
sub-Singleton: FORCE
|
||||
cd Singleton && \
|
||||
$(MAKE) -f $(MAKEFILE)-DeletableSingleton && \
|
||||
$(MAKE) -f $(MAKEFILE)-Phoenix && \
|
||||
$(MAKE) -f $(MAKEFILE)-Dependencies
|
||||
@cd ..
|
||||
|
||||
sub-SmallObj: FORCE
|
||||
cd SmallObj && \
|
||||
$(MAKE) -f $(MAKEFILE) && \
|
||||
$(MAKE) -f $(MAKEFILE)-SmallSingleton
|
||||
@cd ..
|
||||
|
||||
sub-Visitor: FORCE
|
||||
cd Visitor && \
|
||||
$(MAKE) -f $(MAKEFILE)
|
||||
@cd ..
|
||||
|
||||
|
||||
clean:
|
||||
cd Factory && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
cd flex_string && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
cd Longevity && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
cd OrderedStatic && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
cd RegressionTest && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
cd SafeFormat && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
cd SmallObj && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
cd ScopeGuard && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
cd Singleton && \
|
||||
$(MAKE) -f $(MAKEFILE)-DeletableSingleton clean && \
|
||||
$(MAKE) -f $(MAKEFILE)-Phoenix clean && \
|
||||
$(MAKE) -f $(MAKEFILE)-Dependencies clean
|
||||
@cd ..
|
||||
|
||||
cd Visitor && \
|
||||
$(MAKE) -f $(MAKEFILE) clean
|
||||
@cd ..
|
||||
|
||||
|
||||
FORCE:
|
||||
|
||||
$(MAKE) -C Factory clean
|
||||
$(MAKE) -C flex_string clean
|
||||
$(MAKE) -C Longevity clean
|
||||
$(MAKE) -C OrderedStatic clean
|
||||
$(MAKE) -C RegressionTest clean
|
||||
$(MAKE) -C SafeFormat clean
|
||||
$(MAKE) -C ScopeGuard clean
|
||||
$(MAKE) -C Singleton clean
|
||||
$(MAKE) -C SmallObj clean
|
||||
$(MAKE) -C Visitor clean
|
||||
|
|
|
@ -1,32 +1,11 @@
|
|||
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = main.o
|
||||
LINKOBJ = main.o
|
||||
CXXINCS = -I./../../include -I.
|
||||
OBJ = main.o
|
||||
BIN = main-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
|
||||
all: all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
main.o: main.cpp
|
||||
$(CPP) -c main.cpp -o main.o $(CXXFLAGS)
|
||||
|
||||
$(CXX) -o $(BIN) $(OBJ) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ) $(BIN)
|
||||
|
|
|
@ -1,30 +1,11 @@
|
|||
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = Test.o
|
||||
LINKOBJ = Test.o
|
||||
CXXINCS = -I./../../include
|
||||
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
|
||||
all: all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
OBJ = Test.o
|
||||
BIN = main-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
Test.o: Test.cpp
|
||||
$(CPP) -c Test.cpp -o Test.o $(CXXFLAGS)
|
||||
$(CXX) -o $(BIN) $(OBJ) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ) $(BIN)
|
||||
|
|
|
@ -1,30 +1,11 @@
|
|||
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = main.o
|
||||
LINKOBJ = main.o
|
||||
CXXINCS = -I./../../include
|
||||
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
|
||||
all: all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
OBJ = main.o
|
||||
BIN = main-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
main.o: main.cpp
|
||||
$(CPP) -c main.cpp -o main.o $(CXXFLAGS)
|
||||
$(CXX) -o $(BIN) $(OBJ) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ) $(BIN)
|
||||
|
|
|
@ -1,32 +1,11 @@
|
|||
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = main.o
|
||||
LINKOBJ = main.o
|
||||
CXXINCS = -I./../../include -I.
|
||||
OBJ = main.o
|
||||
BIN = main-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
|
||||
all: all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
main.o: main.cpp
|
||||
$(CPP) -c main.cpp -o main.o $(CXXFLAGS)
|
||||
|
||||
$(CXX) -o $(BIN) $(OBJ) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ) $(BIN)
|
||||
|
|
26
test/Singleton/Makefile
Normal file
26
test/Singleton/Makefile
Normal file
|
@ -0,0 +1,26 @@
|
|||
OBJ1 = DeletableSingleton.o
|
||||
OBJ2 = Dependencies.o
|
||||
OBJ3 = Phoenix.o
|
||||
BIN1 = deletable-singleton-gcc
|
||||
BIN2 = dependencies-gcc
|
||||
BIN3 = phoenix-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
|
||||
.PHONY: all
|
||||
all: $(BIN1) $(BIN2) $(BIN3)
|
||||
|
||||
$(BIN1): $(OBJ1)
|
||||
$(CXX) -o $(BIN1) $(OBJ1) $(LIBS)
|
||||
|
||||
$(BIN2): $(OBJ2)
|
||||
$(CXX) -o $(BIN2) $(OBJ2) $(LIBS)
|
||||
|
||||
$(BIN3): $(OBJ3)
|
||||
$(CXX) -o $(BIN3) $(OBJ3) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ1) $(BIN1)
|
||||
rm -f $(OBJ2) $(BIN2)
|
||||
rm -f $(OBJ3) $(BIN3)
|
|
@ -1,35 +1,20 @@
|
|||
OBJ1 = SmallObjBench.o
|
||||
OBJ2 = SmallSingleton.o
|
||||
BIN1 = small-obj-bench-gcc
|
||||
BIN2 = small-singleton-gcc
|
||||
CXXFLAGS = -I../../include -Wall -fexpensive-optimizations -O3
|
||||
LIBS = -L../../lib -lloki
|
||||
|
||||
.PHONY: all
|
||||
all: $(BIN1) $(BIN2)
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = SmallObjBench.o SmallObj.o Singleton.o
|
||||
LINKOBJ = SmallObjBench.o SmallObj.o Singleton.o
|
||||
CXXINCS = -I./../../include -I./../../include/loki
|
||||
CXXFLAGS = $(CXXINCS) -DNDEBUG -fexpensive-optimizations -O3
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
$(BIN1): $(OBJ1)
|
||||
$(CXX) -o $(BIN1) $(OBJ1) $(LIBS)
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
$(BIN2): $(OBJ2)
|
||||
$(CXX) -o $(BIN2) $(OBJ2) $(LIBS)
|
||||
|
||||
all: clean all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
SmallObjBench.o: SmallObjBench.cpp
|
||||
$(CPP) -c SmallObjBench.cpp -o SmallObjBench.o $(CXXFLAGS)
|
||||
|
||||
SmallObj.o: ../../src/SmallObj.cpp
|
||||
$(CPP) -c ../../src/SmallObj.cpp -o SmallObj.o $(CXXFLAGS)
|
||||
|
||||
Singleton.o: ../../src/Singleton.cpp
|
||||
$(CPP) -c ../../src/Singleton.cpp -o Singleton.o $(CXXFLAGS)
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ1) $(BIN1)
|
||||
rm -f $(OBJ2) $(BIN2)
|
||||
|
|
|
@ -1,32 +1,11 @@
|
|||
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = main.o
|
||||
LINKOBJ = main.o
|
||||
CXXINCS = -I./../../include -I.
|
||||
OBJ = main.o
|
||||
BIN = main-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
LIBS = -L../../lib -lloki
|
||||
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
|
||||
all: all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
main.o: main.cpp
|
||||
$(CPP) -c main.cpp -o main.o $(CXXFLAGS)
|
||||
|
||||
$(CXX) -o $(BIN) $(OBJ) $(LIBS)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ) $(BIN)
|
||||
|
|
|
@ -1,31 +1,10 @@
|
|||
|
||||
|
||||
CPP = g++
|
||||
CC = gcc
|
||||
OBJ = main.o
|
||||
LINKOBJ = main.o
|
||||
CXXINCS = -I./../../include
|
||||
CXXFLAGS = $(CXXINCS) -O2 -DNDEBUG
|
||||
BIN = main-gcc.exe
|
||||
RM = rm -f
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
|
||||
.PHONY: all all-before all-after clean clean-custom
|
||||
|
||||
all: all-before $(BIN) all-after
|
||||
|
||||
|
||||
clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
OBJ = main.o
|
||||
BIN = main-gcc
|
||||
CXXFLAGS = -I../../include -Wall -O2
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CPP) $(LINKOBJ) -o main-gcc.exe $(LIBS)
|
||||
|
||||
check_tmp:
|
||||
@$(CHK_DIR_EXISTS) "" $(MKDIR) "tmp"
|
||||
|
||||
|
||||
main.o: main.cpp
|
||||
$(CPP) -c main.cpp -o main.o $(CXXFLAGS)
|
||||
$(CXX) -o $(BIN) $(OBJ)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f $(OBJ) $(BIN)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue