Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 275011
Collapse All | Expand All

(-)duma_2_5_15.orig/comparisons/ex11/Makefile (-5 / +5 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h
3
CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong1
14
BIN=wrong1
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-28 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.c.o:
26
.c.o:
27
	$(CC) $(CFLAGS) -c $< -o $@
27
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
28
28
(-)duma_2_5_15.orig/comparisons/ex12/Makefile (-5 / +5 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h
3
CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong3
14
BIN=wrong3
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-28 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.c.o:
26
.c.o:
27
	$(CC) $(CFLAGS) -c $< -o $@
27
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
28
28
(-)duma_2_5_15.orig/comparisons/ex13/Makefile (-5 / +5 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h
3
CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong6
14
BIN=wrong6
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-28 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.c.o:
26
.c.o:
27
	$(CC) $(CFLAGS) -c $< -o $@
27
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
28
28
(-)duma_2_5_15.orig/comparisons/ex14/Makefile (-5 / +5 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h
3
CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong7
14
BIN=wrong7
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-28 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.c.o:
26
.c.o:
27
	$(CC) $(CFLAGS) -c $< -o $@
27
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
28
28
(-)duma_2_5_15.orig/comparisons/ex15/Makefile (-5 / +5 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h
3
CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=leak1
14
BIN=leak1
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-28 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.c.o:
26
.c.o:
27
	$(CC) $(CFLAGS) -c $< -o $@
27
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
28
28
(-)duma_2_5_15.orig/comparisons/ex16/Makefile (-5 / +5 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h
3
CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=leak2
14
BIN=leak2
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-28 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.c.o:
26
.c.o:
27
	$(CC) $(CFLAGS) -c $< -o $@
27
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
28
28
(-)duma_2_5_15.orig/comparisons/ex17/Makefile (-5 / +5 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include duma.h
3
CFLAGS +=-I$(DUMADIR) -include stdlib.h -include duma.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=ok5
14
BIN=ok5
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-28 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CC) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.c.o:
26
.c.o:
27
	$(CC) $(CFLAGS) -c $< -o $@
27
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
28
28
(-)duma_2_5_15.orig/comparisons/ex21/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong1
14
BIN=wrong1
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/comparisons/ex22/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong2
14
BIN=wrong2
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/comparisons/ex23/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong3
14
BIN=wrong3
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/comparisons/ex24/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong4
14
BIN=wrong4
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/comparisons/ex25/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong5
14
BIN=wrong5
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/comparisons/ex26/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=wrong6
14
BIN=wrong6
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/comparisons/ex27/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=leak1
14
BIN=leak1
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/comparisons/ex28/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=leak2
14
BIN=leak2
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/comparisons/ex29/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=ok5
14
BIN=ok5
15
OBJ=$(BIN).o
15
OBJ=$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cc.o:
26
.cc.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/example_makes/ex1/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR)
3
CXXFLAGS += -I$(DUMADIR)
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=example1
14
BIN=example1
15
OBJ=../../$(BIN).o
15
OBJ=../../$(BIN).o
Lines 21-25 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
(-)duma_2_5_15.orig/example_makes/ex2/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR)
3
CXXFLAGS += -I$(DUMADIR)
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=example2
14
BIN=example2
15
OBJ=../../$(BIN).o
15
OBJ=../../$(BIN).o
Lines 21-25 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
(-)duma_2_5_15.orig/example_makes/ex3/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR)
3
CXXFLAGS += -I$(DUMADIR)
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=example3
14
BIN=example3
15
OBJ=../../$(BIN).o
15
OBJ=../../$(BIN).o
Lines 21-25 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
(-)duma_2_5_15.orig/example_makes/ex4/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR)
3
CXXFLAGS += -I$(DUMADIR)
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=example4
14
BIN=example4
15
OBJ=../../$(BIN).o
15
OBJ=../../$(BIN).o
Lines 21-25 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
(-)duma_2_5_15.orig/example_makes/ex5/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR)
3
CXXFLAGS += -I$(DUMADIR)
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=example5
14
BIN=example5
15
OBJ=../../$(BIN).o
15
OBJ=../../$(BIN).o
Lines 21-25 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
(-)duma_2_5_15.orig/example_makes/ex6/Makefile (-4 / +4 lines)
Lines 1-6 Link Here
1
1
2
DUMADIR=../..
2
DUMADIR=../..
3
CPPFLAGS=-g -O0 -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
3
CXXFLAGS += -I$(DUMADIR) -include stdlib.h -include new -include dumapp.h
4
LFLAGS=$(DUMADIR)/libduma.a
4
LFLAGS=$(DUMADIR)/libduma.a
5
ifeq ($(OS), Windows_NT)
5
ifeq ($(OS), Windows_NT)
6
  LIBS=
6
  LIBS=
Lines 8-15 Link Here
8
  LIBS=-lpthread
8
  LIBS=-lpthread
9
endif
9
endif
10
10
11
CC=gcc
11
CC ?= gcc
12
CXX=g++
12
CXX ?= g++
13
13
14
BIN=example6
14
BIN=example6
15
OBJ=../../$(BIN).o
15
OBJ=../../$(BIN).o
Lines 21-27 Link Here
21
	- rm -f $(OBJ) $(BIN)
21
	- rm -f $(OBJ) $(BIN)
22
22
23
$(BIN): $(OBJ)
23
$(BIN): $(OBJ)
24
	$(CXX) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
24
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(OBJ) $(LFLAGS) $(LIBS) -o $(BIN)
25
25
26
.cpp.o:
26
.cpp.o:
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
27
	$(CXX) $(LDFLAGS) $(CXXFLAGS) -c $< -o $@
(-)duma_2_5_15.orig/GNUmakefile (-93 / +71 lines)
Lines 65-102 Link Here
65
#
65
#
66
########################################
66
########################################
67
67
68
# edit following line
69
DUMA_OPTIONS=
70
71
# no leak detection on any platform:
68
# no leak detection on any platform:
72
# use static library for finding leaks - with information memory was allocated
69
# use static library for finding leaks - with information memory was allocated
73
# i think leak-checking without further information is quite useless!
70
# i think leak-checking without further information is quite useless!
74
# additionaly too many platforms/environments are broken.
71
# additionaly too many platforms/environments are broken.
75
DUMA_OPTIONS += -DDUMA_SO_NO_LEAKDETECTION
72
CPPFLAGS += -DDUMA_SO_NO_LEAKDETECTION $(NUMA_OPTIONS)
76
73
77
# some test cases:
74
# some test cases:
78
#DUMA_OPTIONS += -DDUMA_LIB_NO_LEAKDETECTION
75
#CPPFLAGS += -DDUMA_LIB_NO_LEAKDETECTION
79
#DUMA_OPTIONS += -DDUMA_NO_THREAD_SAFETY
76
#CPPFLAGS += -DDUMA_NO_THREAD_SAFETY
80
#DUMA_OPTIONS += -DDUMA_NO_CPP_SUPPORT
77
#CPPFLAGS += -DDUMA_NO_CPP_SUPPORT
81
78
82
PIC=-fPIC -DPIC
79
# For shared linking,
83
DUMA_SO_OPTIONS=$(PIC) -DDUMA_SO_LIBRARY
80
LFLAGS = -fPIC -DPIC -DDUMA_SO_LIBRARY
84
81
85
# for FreeBSD 5.4
82
# for FreeBSD 5.4
86
# DUMA_OPTIONS += -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
83
# CPPFLAGS += -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
87
#
84
#
88
# for FreeBSD 5.4 if DUMA_EXPLICIT_INIT is not set
85
# for FreeBSD 5.4 if DUMA_EXPLICIT_INIT is not set
89
# DUMA_OPTIONS += -DDUMA_NO_LEAKDETECTION
86
# CPPFLAGS += -DDUMA_NO_LEAKDETECTION
90
#
87
#
91
# for cygwin environment on Windows
88
# for cygwin environment on Windows
92
# DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT
89
# CPPFLAGS += -DDUMA_EXPLICIT_INIT
93
# also define 'WIN32'
90
# also define 'WIN32'
94
91
95
# some defaults:
92
# some defaults:
96
CC=gcc
93
CC?=gcc
97
CXX=g++
94
CXX?=g++
98
AR=ar
95
AR?=ar
99
RANLIB=ranlib
96
RANLIB?=ranlib
100
INSTALL=install
97
INSTALL=install
101
RM=rm
98
RM=rm
102
RMFORCE=rm -f
99
RMFORCE=rm -f
Lines 116-122 Link Here
116
    # using explicit initialization to avoid leak report
113
    # using explicit initialization to avoid leak report
117
    # from __w32_sharedptr_initialize() function
114
    # from __w32_sharedptr_initialize() function
118
    BSWITCH=101
115
    BSWITCH=101
119
    DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT
116
    CPPFLAGS += -DDUMA_EXPLICIT_INIT
120
    RM=del
117
    RM=del
121
    RMFORCE=del /F 2>nul
118
    RMFORCE=del /F 2>nul
122
    ECHO=echo
119
    ECHO=echo
Lines 124-154 Link Here
124
    CURPATH=
121
    CURPATH=
125
    DUMA_DYN_DEPS=
122
    DUMA_DYN_DEPS=
126
    DUMASO=
123
    DUMASO=
127
    CFLAGS=-g -O0
128
    CPPFLAGS=-g -O0
129
    LIBS=
124
    LIBS=
130
    EXEPOSTFIX=.exe
125
    EXEPOSTFIX=.exe
131
  endif
126
  endif
132
  ifeq ($(OSTYPE), cygwin)
127
  ifeq ($(OSTYPE), cygwin)
133
    # call make OSTYPE=cygwin
128
    # call make OSTYPE=cygwin
134
    BSWITCH=102
129
    BSWITCH=102
135
    DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT
130
    CPPFLAGS += -DWIN32 -DDUMA_EXPLICIT_INIT
136
    CURPATH=./
131
    CURPATH=./
137
    DUMA_DYN_DEPS=
132
    DUMA_DYN_DEPS=
138
    DUMASO=
133
    DUMASO=
139
    CFLAGS=-g -O0 -DWIN32 -Wall -Wextra
140
    CPPFLAGS=-g -O0 -DWIN32 -Wall -Wextra
141
    LIBS=
134
    LIBS=
142
    EXEPOSTFIX=.exe
135
    EXEPOSTFIX=.exe
143
  endif
136
  endif
144
  ifndef BSWITCH
137
  ifndef BSWITCH
145
    BSWITCH=100
138
    BSWITCH=100
146
    DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT
139
    CPPFLAGS += -DWIN32 -DDUMA_EXPLICIT_INIT
147
    CURPATH=./
140
    CURPATH=./
148
    DUMA_DYN_DEPS=
141
    DUMA_DYN_DEPS=
149
    DUMASO=
142
    DUMASO=
150
    CFLAGS=-g -O0 -DWIN32
151
    CPPFLAGS=-g -O0 -DWIN32
152
    LIBS=
143
    LIBS=
153
    EXEPOSTFIX=.exe
144
    EXEPOSTFIX=.exe
154
  endif
145
  endif
Lines 158-186 Link Here
158
  # tested on darwin 8.0, which is the base for mac-osx
149
  # tested on darwin 8.0, which is the base for mac-osx
159
  # call: make OS=osx
150
  # call: make OS=osx
160
  BSWITCH=210
151
  BSWITCH=210
161
  DUMA_OPTIONS += -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
152
  CPPFLAGS += -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS -DDUMA_SO_PREFER_GETENV
162
  DUMA_OPTIONS += -DDUMA_SO_PREFER_GETENV
153
#  CPPFLAGS += -DDUMA_LIB_NO_LEAKDETECTION
163
#  DUMA_OPTIONS += -DDUMA_LIB_NO_LEAKDETECTION
164
  CURPATH=./
154
  CURPATH=./
165
#  DUMA_DYN_DEPS=
155
#  DUMA_DYN_DEPS=
166
  DUMASO=libduma.dylib
156
  DUMASO=libduma.dylib
167
  DUMASO_LINK1=libduma.dylib
157
  DUMASO_LINK1=libduma.dylib
168
  CFLAGS=-g -O0
169
  CPPFLAGS=-g -O0
170
  LIBS=-lpthread
158
  LIBS=-lpthread
171
  EXEPOSTFIX=
159
  EXEPOSTFIX=
172
endif
160
endif
173
161
174
ifeq ($(OS), freebsd)
162
ifeq ($(OS), freebsd)
175
  BSWITCH=310
163
  BSWITCH=310
176
  DUMA_OPTIONS += -DDUMA_NO_THREAD_SAFETY
164
  CPPFLAGS += -DDUMA_NO_THREAD_SAFETY -DDUMA_EXPLICIT_INIT
177
  DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT
178
  CURPATH=./
165
  CURPATH=./
179
  DUMA_DYN_DEPS=
166
  DUMA_DYN_DEPS=
180
  DUMASO=
167
  DUMASO=
181
  DUMASO_LINK1=
168
  DUMASO_LINK1=
182
  CFLAGS=-g -O0
183
  CPPFLAGS=-g -O0
184
  LIBS=-lpthread
169
  LIBS=-lpthread
185
  EXEPOSTFIX=
170
  EXEPOSTFIX=
186
endif
171
endif
Lines 191-215 Link Here
191
  DUMASO=libduma.so.0.0.0
176
  DUMASO=libduma.so.0.0.0
192
  DUMASO_LINK1=libduma.so.0
177
  DUMASO_LINK1=libduma.so.0
193
  DUMASO_LINK2=libduma.so
178
  DUMASO_LINK2=libduma.so
194
  CFLAGS=-g -O0
195
  CPPFLAGS=-g -O0
196
  LIBS=-lpthread
179
  LIBS=-lpthread
197
  EXEPOSTFIX=
180
  EXEPOSTFIX=
198
endif
181
endif
199
182
200
ifeq ($(OS), solaris)
183
ifeq ($(OS), solaris)
201
  BSWITCH=410
184
  BSWITCH=410
202
  DUMA_OPTIONS += -DDUMA_NO_STRERROR
185
  CPPFLAGS += -DDUMA_NO_STRERROR
203
  CURPATH=./
186
  CURPATH=./
204
  DUMA_DYN_DEPS=
187
  DUMA_DYN_DEPS=
205
  DUMASO=libduma.so.0.0.0
188
  DUMASO=libduma.so.0.0.0
206
  DUMASO_LINK1=libduma.so.0
189
  DUMASO_LINK1=libduma.so.0
207
  DUMASO_LINK2=libduma.so
190
  DUMASO_LINK2=libduma.so
208
  CFLAGS=-g -O0
191
  LIBS=-lgcc_s -Wl,-R/opt/sfw/lib -lpthread
209
  CPPFLAGS=-g -O0
210
  LDFLAGS += -lgcc_s
211
  LDOPTIONS += -lgcc_s
212
  LIBS=-Wl,-R/opt/sfw/lib -lpthread
213
  EXEPOSTFIX=
192
  EXEPOSTFIX=
214
endif
193
endif
215
194
Lines 220-227 Link Here
220
  DUMASO=libduma.so.0.0.0
199
  DUMASO=libduma.so.0.0.0
221
  DUMASO_LINK1=libduma.so.0
200
  DUMASO_LINK1=libduma.so.0
222
  DUMASO_LINK2=libduma.so
201
  DUMASO_LINK2=libduma.so
223
  CFLAGS=-g -O0 -Wall -Wextra
224
  CPPFLAGS=-g -O0 -Wall -Wextra
225
  LIBS=-lpthread
202
  LIBS=-lpthread
226
  EXEPOSTFIX=
203
  EXEPOSTFIX=
227
endif
204
endif
Lines 234-241 Link Here
234
  DUMASO=libduma.so.0.0.0
211
  DUMASO=libduma.so.0.0.0
235
  DUMASO_LINK1=libduma.so.0
212
  DUMASO_LINK1=libduma.so.0
236
  DUMASO_LINK2=libduma.so
213
  DUMASO_LINK2=libduma.so
237
  CFLAGS=-g -O0 -Wall -Wextra
238
  CPPFLAGS=-g -O0 -Wall -Wextra
239
  LIBS=-lpthread
214
  LIBS=-lpthread
240
  EXEPOSTFIX=
215
  EXEPOSTFIX=
241
endif
216
endif
Lines 243-251 Link Here
243
218
244
############################################################
219
############################################################
245
220
246
MAN_INSTALL_DIR=$(prefix)/share/man/man3
247
DOC_INSTALL_DIR=$(prefix)/share/doc/duma
248
249
ifndef srcdir
221
ifndef srcdir
250
  srcdir=.
222
  srcdir=.
251
  $(info using default srcdir [$(srcdir)])
223
  $(info using default srcdir [$(srcdir)])
Lines 271-276 Link Here
271
  datadir=$(prefix)/share
243
  datadir=$(prefix)/share
272
endif
244
endif
273
245
246
ifndef mandir
247
  mandir=$(datadir)/man
248
endif
249
274
# The directory for installing read-only data files that pertain to a single machine--that is to say, files for configuring a host.
250
# The directory for installing read-only data files that pertain to a single machine--that is to say, files for configuring a host.
275
ifndef sysconfdir
251
ifndef sysconfdir
276
  sysconfdir=$(prefix)/etc
252
  sysconfdir=$(prefix)/etc
Lines 286-291 Link Here
286
  includedir=$(prefix)/include
262
  includedir=$(prefix)/include
287
endif
263
endif
288
264
265
ifndef docdir
266
  docdir=$(datadir)/doc/duma
267
endif
289
268
290
PACKAGE_SOURCE=README.txt CHANGELOG COPYING-GPL COPYING-LGPL duma.3 Makefile gdbinit.rc \
269
PACKAGE_SOURCE=README.txt CHANGELOG COPYING-GPL COPYING-LGPL duma.3 Makefile gdbinit.rc \
291
	duma.h dumapp.h duma_sem.h paging.h print.h duma_hlp.h noduma.h \
270
	duma.h dumapp.h duma_sem.h paging.h print.h duma_hlp.h noduma.h \
Lines 344-349 Link Here
344
	@echo exec_prefix     [$(exec_prefix)]
323
	@echo exec_prefix     [$(exec_prefix)]
345
	@echo bindir          [$(bindir)]
324
	@echo bindir          [$(bindir)]
346
	@echo datadir         [$(datadir)]
325
	@echo datadir         [$(datadir)]
326
	@echo mandir          [$(mandir)]
327
	@echo docdir          [$(docdir)]
347
	@echo sysconfdir      [$(sysconfdir)]
328
	@echo sysconfdir      [$(sysconfdir)]
348
	@echo libdir          [$(libdir)]
329
	@echo libdir          [$(libdir)]
349
	@echo includedir      [$(includedir)]
330
	@echo includedir      [$(includedir)]
Lines 352-363 Link Here
352
else
333
else
353
	@echo oldincludedir empty
334
	@echo oldincludedir empty
354
endif
335
endif
355
	@echo MAN_INSTALL_DIR [$(MAN_INSTALL_DIR)]
356
	@echo DOC_INSTALL_DIR [$(DOC_INSTALL_DIR)]
357
	@echo MAKE            [$(MAKE)]
336
	@echo MAKE            [$(MAKE)]
358
	@echo CC              [$(CC)]
337
	@echo CC              [$(CC)]
359
	@echo CFLAGS          [$(CFLAGS)]
338
	@echo CFLAGS          [$(CFLAGS)]
360
	@echo CXX             [$(CXX)]
339
	@echo CXX             [$(CXX)]
340
	@echo CXXFLAGS        [$(CXXFLAGS)]
361
	@echo CPPFLAGS        [$(CPPFLAGS)]
341
	@echo CPPFLAGS        [$(CPPFLAGS)]
362
	@echo LD              [$(LD)]
342
	@echo LD              [$(LD)]
363
	@echo AR              [$(AR)]
343
	@echo AR              [$(AR)]
Lines 368-378 Link Here
368
	@echo RMFORCE         [$(RMFORCE)]
348
	@echo RMFORCE         [$(RMFORCE)]
369
	@echo ECHO            [$(ECHO)]
349
	@echo ECHO            [$(ECHO)]
370
	@echo ECHOLF          [$(ECHOLF)]
350
	@echo ECHOLF          [$(ECHOLF)]
371
	@echo PIC             [$(PIC)]
351
	@echo LFLAGS          [$(LFLAGS)]
372
	@echo EXEPOSTFIX      [$(EXEPOSTFIX)]
352
	@echo EXEPOSTFIX      [$(EXEPOSTFIX)]
373
	@echo CURPATH         [$(CURPATH)]
353
	@echo CURPATH         [$(CURPATH)]
374
	@echo DUMA_OPTIONS    [$(DUMA_OPTIONS)]
375
	@echo DUMA_SO_OPTIONS [$(DUMA_SO_OPTIONS)]
376
	@echo OBJECTS         [$(OBJECTS)]
354
	@echo OBJECTS         [$(OBJECTS)]
377
	@echo SO_OBJECTS      [$(SO_OBJECTS)]
355
	@echo SO_OBJECTS      [$(SO_OBJECTS)]
378
	@echo DUMASO          [$(DUMASO)]
356
	@echo DUMASO          [$(DUMASO)]
Lines 386-393 Link Here
386
# commands; copy any auxiliary files that the executable uses into the
364
# commands; copy any auxiliary files that the executable uses into the
387
# directories where it will look for them.
365
# directories where it will look for them.
388
install: libduma.a duma.3 $(DUMASO)
366
install: libduma.a duma.3 $(DUMASO)
389
	- mkdir -p $(DOC_INSTALL_DIR)
367
	- mkdir -p $(docdir)
390
	$(INSTALL) -m 644 README.txt $(DOC_INSTALL_DIR)
368
	$(INSTALL) -m 644 README.txt $(docdir)
391
	- mkdir -p $(includedir)
369
	- mkdir -p $(includedir)
392
	$(INSTALL) -m 644 noduma.h duma.h dumapp.h duma_sem.h duma_config.h $(includedir)
370
	$(INSTALL) -m 644 noduma.h duma.h dumapp.h duma_sem.h duma_config.h $(includedir)
393
	- mkdir -p $(bindir)
371
	- mkdir -p $(bindir)
Lines 405-417 Link Here
405
	- $(RMFORCE) $(libdir)/$(DUMASO_LINK2)
383
	- $(RMFORCE) $(libdir)/$(DUMASO_LINK2)
406
	ln -s $(DUMASO) $(libdir)/$(DUMASO_LINK2)
384
	ln -s $(DUMASO) $(libdir)/$(DUMASO_LINK2)
407
endif
385
endif
408
	- mkdir -p $(MAN_INSTALL_DIR)
386
	- mkdir -p $(mandir)/man3
409
	$(INSTALL) -m 644 duma.3 $(MAN_INSTALL_DIR)/duma.3
387
	$(INSTALL) -m 644 duma.3 $(mandir)/man3/duma.3
410
388
411
389
412
# Delete all the installed files that the `install' target would create
390
# Delete all the installed files that the `install' target would create
413
uninstall:
391
uninstall:
414
	- $(RMFORCE) $(DOC_INSTALL_DIR)/README.txt
392
	- $(RMFORCE) $(docdir)/README.txt
415
	- $(RMFORCE) $(includedir)/noduma.h
393
	- $(RMFORCE) $(includedir)/noduma.h
416
	- $(RMFORCE) $(includedir)/duma.h
394
	- $(RMFORCE) $(includedir)/duma.h
417
	- $(RMFORCE) $(includedir)/dumapp.h
395
	- $(RMFORCE) $(includedir)/dumapp.h
Lines 428-434 Link Here
428
ifdef DUMASO_LINK2
406
ifdef DUMASO_LINK2
429
	- $(RMFORCE) $(libdir)/$(DUMASO_LINK2)
407
	- $(RMFORCE) $(libdir)/$(DUMASO_LINK2)
430
endif
408
endif
431
	- $(RMFORCE) $(MAN_INSTALL_DIR)/duma.3
409
	- $(RMFORCE) $(mandir)/man3/duma.3
432
410
433
411
434
# Delete all files that are normally created by running make.
412
# Delete all files that are normally created by running make.
Lines 471-509 Link Here
471
449
472
createconf$(EXEPOSTFIX): createconf.o
450
createconf$(EXEPOSTFIX): createconf.o
473
	- $(RMFORCE) createconf$(EXEPOSTFIX)
451
	- $(RMFORCE) createconf$(EXEPOSTFIX)
474
	$(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
452
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) createconf.o -o createconf$(EXEPOSTFIX)
475
453
476
tstheap$(EXEPOSTFIX): libduma.a tstheap.o
454
tstheap$(EXEPOSTFIX): libduma.a tstheap.o
477
	- $(RMFORCE) tstheap$(EXEPOSTFIX)
455
	- $(RMFORCE) tstheap$(EXEPOSTFIX)
478
	$(CC) $(CFLAGS) tstheap.o libduma.a -o tstheap$(EXEPOSTFIX) $(LIBS)
456
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) tstheap.o libduma.a -o tstheap$(EXEPOSTFIX) $(LIBS)
479
457
480
dumatest$(EXEPOSTFIX): libduma.a dumatest.o
458
dumatest$(EXEPOSTFIX): libduma.a dumatest.o
481
	- $(RMFORCE) dumatest$(EXEPOSTFIX)
459
	- $(RMFORCE) dumatest$(EXEPOSTFIX)
482
	$(CC) $(CFLAGS) dumatest.o libduma.a -o dumatest$(EXEPOSTFIX) $(LIBS)
460
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) dumatest.o libduma.a -o dumatest$(EXEPOSTFIX) $(LIBS)
483
461
484
dumatestpp$(EXEPOSTFIX): libduma.a dumatestpp.o duma_sem.h dumapp.h
462
dumatestpp$(EXEPOSTFIX): libduma.a dumatestpp.o duma_sem.h dumapp.h
485
	- $(RMFORCE) dumatestpp$(EXEPOSTFIX)
463
	- $(RMFORCE) dumatestpp$(EXEPOSTFIX)
486
	$(CXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp$(EXEPOSTFIX) $(LIBS)
464
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp$(EXEPOSTFIX) $(LIBS)
487
465
488
thread-test$(EXEPOSTFIX): libduma.a thread-test.o
466
thread-test$(EXEPOSTFIX): libduma.a thread-test.o
489
	- $(RMFORCE) thread-test$(EXEPOSTFIX)
467
	- $(RMFORCE) thread-test$(EXEPOSTFIX)
490
	$(CC) $(CFLAGS) thread-test.o libduma.a -o thread-test$(EXEPOSTFIX) $(LIBS)
468
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) thread-test.o libduma.a -o thread-test$(EXEPOSTFIX) $(LIBS)
491
469
492
testmt$(EXEPOSTFIX): libduma.a testmt.o
470
testmt$(EXEPOSTFIX): libduma.a testmt.o
493
	- $(RMFORCE) testmt$(EXEPOSTFIX)
471
	- $(RMFORCE) testmt$(EXEPOSTFIX)
494
	$(CC) $(CFLAGS) testmt.o libduma.a -o testmt$(EXEPOSTFIX) $(LIBS)
472
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) testmt.o libduma.a -o testmt$(EXEPOSTFIX) $(LIBS)
495
473
496
testoperators$(EXEPOSTFIX): libduma.a testoperators.o duma_sem.h dumapp.h
474
testoperators$(EXEPOSTFIX): libduma.a testoperators.o duma_sem.h dumapp.h
497
	- $(RMFORCE) testoperators$(EXEPOSTFIX)
475
	- $(RMFORCE) testoperators$(EXEPOSTFIX)
498
	$(CXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators$(EXEPOSTFIX) $(LIBS)
476
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) testoperators.o libduma.a -o testoperators$(EXEPOSTFIX) $(LIBS)
499
477
500
tstheap_so$(EXEPOSTFIX): tstheap_so.o
478
tstheap_so$(EXEPOSTFIX): tstheap_so.o
501
	- $(RMFORCE) tstheap_so$(EXEPOSTFIX)
479
	- $(RMFORCE) tstheap_so$(EXEPOSTFIX)
502
	$(CC) $(CFLAGS) tstheap_so.o -o tstheap_so$(EXEPOSTFIX) $(LIBS)
480
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) tstheap_so.o -o tstheap_so$(EXEPOSTFIX) $(LIBS)
503
481
504
dumatestpp_so$(EXEPOSTFIX): dumatestpp_so.o
482
dumatestpp_so$(EXEPOSTFIX): dumatestpp_so.o
505
	- $(RMFORCE) dumatestpp_so$(EXEPOSTFIX)
483
	- $(RMFORCE) dumatestpp_so$(EXEPOSTFIX)
506
	$(CXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so$(EXEPOSTFIX) $(LIBS)
484
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so$(EXEPOSTFIX) $(LIBS)
507
485
508
486
509
$(OBJECTS) tstheap.o dumatest.o thread-test.o testmt.o dumatestpp.o: duma.h
487
$(OBJECTS) tstheap.o dumatest.o thread-test.o testmt.o dumatestpp.o: duma.h
Lines 514-527 Link Here
514
  ifeq ($(OS), osx)
492
  ifeq ($(OS), osx)
515
493
516
$(DUMASO): duma_config.h $(SO_OBJECTS)
494
$(DUMASO): duma_config.h $(SO_OBJECTS)
517
	$(CXX) -g -dynamiclib -Wl -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
495
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -dynamiclib -Wl -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
518
	$(CXX) -g -dynamiclib -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
496
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -dynamiclib -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
519
497
520
  else
498
  else
521
499
522
$(DUMASO): duma_config.h $(SO_OBJECTS)
500
$(DUMASO): duma_config.h $(SO_OBJECTS)
523
	$(CXX) -g -shared -Wl,-soname,$(DUMASO) -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
501
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -shared -Wl,-soname,$(DUMASO) -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
524
#	$(CXX) -g -shared -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
502
#	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -shared -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
525
503
526
  endif
504
  endif
527
505
Lines 532-538 Link Here
532
# define rules how to build objects for createconf
510
# define rules how to build objects for createconf
533
#
511
#
534
createconf.o:
512
createconf.o:
535
	$(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
513
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c createconf.c -o $@
536
514
537
515
538
#
516
#
Lines 540-578 Link Here
540
#
518
#
541
519
542
dumapp_so.o:	dumapp.cpp duma.h duma_sem.h dumapp.h
520
dumapp_so.o:	dumapp.cpp duma.h duma_sem.h dumapp.h
543
	$(CXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumapp.cpp -o $@
521
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(LFLAGS) -c dumapp.cpp -o $@
544
522
545
duma_so.o:	duma.c duma.h duma_config.h
523
duma_so.o:	duma.c duma.h duma_config.h
546
	$(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c duma.c -o $@
524
	$(CC) $(LDFLAGS) $(CFLAGS) $(LFLAGS) -c duma.c -o $@
547
525
548
sem_inc_so.o:	sem_inc.c duma_sem.h
526
sem_inc_so.o:	sem_inc.c duma_sem.h
549
	$(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c sem_inc.c -o $@
527
	$(CC) $(LDFLAGS) $(CFLAGS) $(LFLAGS) -c sem_inc.c -o $@
550
528
551
print_so.o:	print.c print.h
529
print_so.o:	print.c print.h
552
	$(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c print.c -o $@
530
	$(CC) $(LDFLAGS) $(CFLAGS) $(LFLAGS) -c print.c -o $@
553
531
554
# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
532
# LFLAGS needed cause duma.h is included explicitly
555
tstheap_so.o:
533
tstheap_so.o:
556
	$(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
534
	$(CC) $(LDFLAGS) $(CFLAGS) $(LFLAGS) -c tstheap.c -o $@
557
535
558
dumatestpp_so.o:
536
dumatestpp_so.o:
559
	$(CXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
537
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(LFLAGS) -c dumatestpp.cpp -o $@
560
538
561
#
539
#
562
# define rules how to build objects for static library
540
# define rules how to build objects for static library
563
#
541
#
564
542
565
dumapp.o:	dumapp.cpp duma.h duma_sem.h dumapp.h
543
dumapp.o:	dumapp.cpp duma.h duma_sem.h dumapp.h
566
	$(CXX) $(CPPFLAGS) -c dumapp.cpp -o $@
544
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c dumapp.cpp -o $@
567
545
568
duma.o:	duma.c duma.h duma_config.h
546
duma.o:	duma.c duma.h duma_config.h
569
	$(CC) $(CFLAGS) -c duma.c -o $@
547
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c duma.c -o $@
570
548
571
sem_inc.o:	sem_inc.c duma_sem.h
549
sem_inc.o:	sem_inc.c duma_sem.h
572
	$(CC) $(CFLAGS) -c sem_inc.c -o $@
550
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c sem_inc.c -o $@
573
551
574
print.o:	print.c print.h
552
print.o:	print.c print.h
575
	$(CC) $(CFLAGS) -c print.c -o $@
553
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c print.c -o $@
576
554
577
555
578
#
556
#
Lines 580-611 Link Here
580
#
558
#
581
559
582
dumatest.o:	dumatest.c duma.h duma_config.h
560
dumatest.o:	dumatest.c duma.h duma_config.h
583
	$(CC) $(CFLAGS) -c dumatest.c -o $@
561
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c dumatest.c -o $@
584
562
585
dumatestpp.o:	dumatestpp.cpp duma.h duma_sem.h dumapp.h duma_config.h
563
dumatestpp.o:	dumatestpp.cpp duma.h duma_sem.h dumapp.h duma_config.h
586
	$(CXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
564
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c dumatestpp.cpp -o $@
587
565
588
tstheap.o:	tstheap.c duma.h duma_config.h
566
tstheap.o:	tstheap.c duma.h duma_config.h
589
	$(CC) $(CFLAGS) -c tstheap.c -o $@
567
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c tstheap.c -o $@
590
568
591
testoperators.o:	testoperators.cpp duma.h duma_sem.h dumapp.h duma_config.h
569
testoperators.o:	testoperators.cpp duma.h duma_sem.h dumapp.h duma_config.h
592
	$(CXX) $(CPPFLAGS) -c testoperators.cpp -o $@
570
	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c testoperators.cpp -o $@
593
571
594
thread-test.o:	thread-test.c duma.h duma_config.h
572
thread-test.o:	thread-test.c duma.h duma_config.h
595
	$(CC) $(CFLAGS) -c thread-test.c -o $@
573
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c thread-test.c -o $@
596
574
597
testmt.o:	testmt.c duma.h duma_config.h
575
testmt.o:	testmt.c duma.h duma_config.h
598
	$(CC) $(CFLAGS) -c testmt.c -o $@
576
	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c testmt.c -o $@
599
577
600
578
601
#
579
#
602
# default rules
580
# default rules
603
#
581
#
604
#.c.o:
582
#.c.o:
605
#	$(CC) $(CFLAGS) -c $< -o $@
583
#	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
606
#
584
#
607
#.cpp.o:
585
#.cpp.o:
608
#	$(CXX) $(CPPFLAGS) -c $< -o $@
586
#	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
609
#
587
#
610
588
611
.PHONY: check test installcheck install uninstall clean distclean realclean clobber dos2unix printvars
589
.PHONY: check test installcheck install uninstall clean distclean realclean clobber dos2unix printvars
(-)duma_2_5_15.orig/README.txt (-2 / +2 lines)
Lines 377-383 Link Here
377
linenumber of the calling function. The atexit() function checks if each
377
linenumber of the calling function. The atexit() function checks if each
378
allocated memory block was freed. To disable leak detection add the
378
allocated memory block was freed. To disable leak detection add the
379
preprocessor definition 'DUMA_SO_NO_LEAKDETECTION' or
379
preprocessor definition 'DUMA_SO_NO_LEAKDETECTION' or
380
'DUMA_LIB_NO_LEAKDETECTION' to DUMA_OPTIONS in Makefile.
380
'DUMA_LIB_NO_LEAKDETECTION' to CPPFLAGS in Makefile.
381
If a leak is reported without source filename and line number but is
381
If a leak is reported without source filename and line number but is
382
reproducible with the same pointer, set a conditional breakpoint on the
382
reproducible with the same pointer, set a conditional breakpoint on the
383
function 'void * duma_alloc_return( void * address)'
383
function 'void * duma_alloc_return( void * address)'
Lines 392-398 Link Here
392
same leak detection reports as for malloc and free. 'dumapp.h' needs to be
392
same leak detection reports as for malloc and free. 'dumapp.h' needs to be
393
included from your source file(s).
393
included from your source file(s).
394
For disabling the C++ new/delete/new[] and delete[] operators, add the
394
For disabling the C++ new/delete/new[] and delete[] operators, add the
395
preprocessor definition 'DUMA_NO_CPP_SUPPORT' to DUMA_OPTIONS in Makefile.
395
preprocessor definition 'DUMA_NO_CPP_SUPPORT' to CPPFLAGS in Makefile.
396
396
397
397
398
DEFINITION OF OWN MEMBER NEW/DELETE OPERATORS:
398
DEFINITION OF OWN MEMBER NEW/DELETE OPERATORS:

Return to bug 275011