King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- Make it easier to overwrite CXXFLAGS, by using CPPFLAGS for loki specific stuff

Browse source 
- Don't create temporary object files anymore, use implicit rule for binaries
- Removed unneeded DESTDIR= line


git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@463 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
lfittl 2006-01-09 23:56:13 +00:00
parent ba38940146
commit d51dd537ea
14 changed files with 89 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,5 +1,3 @@
DESTDIR := $(CURDIR)/$(DESTDIR)
.PHONY: build check install clean .PHONY: build check install clean
build: build:
$(MAKE) -C src $(MAKE) -C src

6
include/Makefile
View file

@ -4,6 +4,6 @@ install:
mkdir -p $(DESTDIR)/usr/include/loki/flex mkdir -p $(DESTDIR)/usr/include/loki/flex
mkdir -p $(DESTDIR)/usr/include/loki/yasli mkdir -p $(DESTDIR)/usr/include/loki/yasli
install loki/*.h $(DESTDIR)/usr/include/loki install -m 644 loki/*.h $(DESTDIR)/usr/include/loki
install loki/flex/*.h $(DESTDIR)/usr/include/loki/flex install -m 644 loki/flex/*.h $(DESTDIR)/usr/include/loki/flex
install loki/yasli/*.h $(DESTDIR)/usr/include/loki/yasli install -m 644 loki/yasli/*.h $(DESTDIR)/usr/include/loki/yasli

3
src/Makefile
View file

@ -1,6 +1,7 @@
OBJ = Singleton.o SmallObj.o OrderedStatic.o OBJ = Singleton.o SmallObj.o OrderedStatic.o
BIN = ../lib/libloki.a BIN = ../lib/libloki.a
CXXFLAGS = -I../include -Wall -O2 -DNDEBUG CXXFLAGS = -Wall -O2
CPPFLAGS = -I../include -DNDEBUG
$(BIN): $(OBJ) $(BIN): $(OBJ)
ar rs $(BIN) $(OBJ) ar rs $(BIN) $(OBJ)

17
test/Factory/Makefile
View file

@ -1,11 +1,10 @@
OBJ = Factory.o BIN = Factory
BIN = main-gcc CXXFLAGS = -Wall -O2
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG CPPFLAGS = -I../../include -DNDEBUG
LIBS = -L../../lib -lloki LDFLAGS = -L../../lib
LDLIBS = -lloki
$(BIN): $(OBJ) .PHONY: build clean
$(CXX) -o $(BIN) $(OBJ) $(LIBS) build: $(BIN)
.PHONY: clean
clean: clean:
rm -f $(OBJ) $(BIN) rm -f $(BIN)

17
test/Function/Makefile
View file

@ -1,11 +1,10 @@
OBJ = FunctionTest.o BIN = FunctionTest
BIN = main-gcc CXXFLAGS = -Wall -O2
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG CPPFLAGS = -I../../include -DNDEBUG
LIBS = -L../../lib -lloki LDFLAGS = -L../../lib
LDLIBS = -lloki -lboost_test_exec_monitor
$(BIN): $(OBJ) .PHONY: build clean
$(CXX) -o $(BIN) $(OBJ) $(LIBS) build: $(BIN)
.PHONY: clean
clean: clean:
rm -f $(OBJ) $(BIN) rm -f $(BIN)

27
test/Longevity/Makefile
View file

@ -1,20 +1,11 @@
OBJ1 = main.o BIN1 = main
OBJ2 = main2.o BIN2 = main2
BIN1 = main-gcc CXXFLAGS = -Wall -fexpensive-optimizations -O3
BIN2 = main2-gcc CPPFLAGS = -I../../include -DNDEBUG
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG LDFLAGS = -L../../lib
LIBS = -L../../lib -lloki LDLIBS = -lloki
.PHONY: all .PHONY: build clean
all: $(BIN1) $(BIN2) build: $(BIN1) $(BIN2)
$(BIN1): $(OBJ1)
$(CXX) -o $(BIN1) $(OBJ1) $(LIBS)
$(BIN2): $(OBJ2)
$(CXX) -o $(BIN2) $(OBJ2) $(LIBS)
.PHONY: clean
clean: clean:
rm -f $(OBJ1) $(BIN1) rm -f $(BIN1) $(BIN2)
rm -f $(OBJ2) $(BIN2)

17
test/OrderedStatic/Makefile
View file

@ -1,11 +1,10 @@
OBJ = main.o BIN = main
BIN = main-gcc CXXFLAGS = -Wall -O2
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG CPPFLAGS = -I../../include -DNDEBUG
LIBS = -L../../lib -lloki LDFLAGS = -L../../lib
LDLIBS = -lloki
$(BIN): $(OBJ) .PHONY: build clean
$(CXX) -o $(BIN) $(OBJ) $(LIBS) build: $(BIN)
.PHONY: clean
clean: clean:
rm -f $(OBJ) $(BIN) rm -f $(BIN)

17
test/RegressionTest/Makefile
View file

@ -1,11 +1,10 @@
OBJ = Test.o BIN = Test
BIN = main-gcc CXXFLAGS = -Wall -O2
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG CPPFLAGS = -I../../include -DNDEBUG
LIBS = -L../../lib -lloki LDFLAGS = -L../../lib
LDLIBS = -lloki
$(BIN): $(OBJ) .PHONY: build clean
$(CXX) -o $(BIN) $(OBJ) $(LIBS) build: $(BIN)
.PHONY: clean
clean: clean:
rm -f $(OBJ) $(BIN) rm -f $(BIN)

15
test/SafeFormat/Makefile
View file

@ -1,11 +1,8 @@
OBJ = main.o BIN = main
BIN = main-gcc CXXFLAGS = -Wall -O2
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG CPPFLAGS = -I../../include -DNDEBUG
LIBS =
$(BIN): $(OBJ) .PHONY: build clean
$(CXX) -o $(BIN) $(OBJ) $(LIBS) build: $(BIN)
.PHONY: clean
clean: clean:
rm -f $(OBJ) $(BIN) rm -f $(BIN)

17
test/ScopeGuard/Makefile
View file

@ -1,11 +1,10 @@
OBJ = main.o BIN = main
BIN = main-gcc CXXFLAGS = -Wall -O2
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG CPPFLAGS = -I../../include -DNDEBUG
LIBS = -L../../lib -lloki LDFLAGS = -L../../lib
LDLIBS = -lloki
$(BIN): $(OBJ) .PHONY: build clean
$(CXX) -o $(BIN) $(OBJ) $(LIBS) build: $(BIN)
.PHONY: clean
clean: clean:
rm -f $(OBJ) $(BIN) rm -f $(BIN)

34
test/Singleton/Makefile
View file

@ -1,26 +1,12 @@
OBJ1 = DeletableSingleton.o BIN1 = DeletableSingleton
OBJ2 = Dependencies.o BIN2 = Dependencies
OBJ3 = Phoenix.o BIN3 = Phoenix
BIN1 = deletable-singleton-gcc CXXFLAGS = -Wall -O2
BIN2 = dependencies-gcc CPPFLAGS = -I../../include -DNDEBUG
BIN3 = phoenix-gcc LDFLAGS = -L../../lib
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG LDLIBS = -lloki
LIBS = -L../../lib -lloki
.PHONY: all .PHONY: build clean
all: $(BIN1) $(BIN2) $(BIN3) build: $(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: clean:
rm -f $(OBJ1) $(BIN1) rm -f $(BIN1) $(BIN2) $(BIN3)
rm -f $(OBJ2) $(BIN2)
rm -f $(OBJ3) $(BIN3)

27
test/SmallObj/Makefile
View file

@ -1,20 +1,11 @@
OBJ1 = SmallObjBench.o BIN1 = SmallObjBench
OBJ2 = SmallObjSingleton.o BIN2 = SmallObjSingleton
BIN1 = small-obj-bench-gcc CXXFLAGS = -Wall -fexpensive-optimizations -O3
BIN2 = small-obj-singleton-gcc CPPFLAGS = -I../../include -DNDEBUG
CXXFLAGS = -I../../include -Wall -fexpensive-optimizations -O3 -DNDEBUG LDFLAGS = -L../../lib
LIBS = -L../../lib -lloki LDLIBS = -lloki
.PHONY: all .PHONY: build clean
all: $(BIN1) $(BIN2) build: $(BIN1) $(BIN2)
$(BIN1): $(OBJ1)
$(CXX) -o $(BIN1) $(OBJ1) $(LIBS)
$(BIN2): $(OBJ2)
$(CXX) -o $(BIN2) $(OBJ2) $(LIBS)
.PHONY: clean
clean: clean:
rm -f $(OBJ1) $(BIN1) rm -f $(BIN1) $(BIN2)
rm -f $(OBJ2) $(BIN2)

17
test/Visitor/Makefile
View file

@ -1,11 +1,10 @@
OBJ = main.o BIN = main
BIN = main-gcc CXXFLAGS = -Wall -O2
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG CPPFLAGS = -I../../include -DNDEBUG
LIBS = -L../../lib -lloki LDFLAGS = -L../../lib
LDLIBS = -lloki
$(BIN): $(OBJ) .PHONY: build clean
$(CXX) -o $(BIN) $(OBJ) $(LIBS) build: $(BIN)
.PHONY: clean
clean: clean:
rm -f $(OBJ) $(BIN) rm -f $(BIN)

3
test/flex_string/Makefile
View file

@ -1,6 +1,7 @@
OBJ = main.o OBJ = main.o
BIN = main-gcc BIN = main-gcc
CXXFLAGS = -I../../include -Wall -O2 -DNDEBUG CXXFLAGS = -Wall -O2
CPPFLAGS = -I../../include -DNDEBUG
$(BIN): $(OBJ) $(BIN): $(OBJ)
$(CXX) -o $(BIN) $(OBJ) $(CXX) -o $(BIN) $(OBJ)