1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
Subject: Makefile fixes for Debianisation
Origin: Debian
Forwarded: not-needed
Author: Wookey <wookey@wookware.org>
Last-Update: 2018-12-11
Description: Changes to makefile for correct Debian package build
Remove configs and targets for non-Debian builds
@@ -86,7 +86,6 @@ VTKLIBS = -lvtkHybrid -lvtkImaging -lvtk
endif
CXXPFLAGS = \
-std=c++14 \
- -Wno-deprecated \
$(shell $(WX_CONFIG) --cxxflags) \
$(shell pkg-config freetype2 --cflags) \
-I$(VTKPATH)
@@ -177,24 +176,24 @@ LDBFLAGS = $(STRIPFLAG)
# compiler settings
-CXXFLAGS := -Wall -D_GNU_SOURCE -DLOCH $(CXXPFLAGS) $(CXXBFLAGS)
-CCFLAGS := -Wall -D_GNU_SOURCE -DLOCH $(CCPFLAGS) $(CCBFLAGS)
+CXXFLAGS_ := $(CXXFLAGS) -Wall -D_GNU_SOURCE -DLOCH $(CXXPFLAGS) $(CXXBFLAGS)
+CCFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE -DLOCH $(CCPFLAGS) $(CCBFLAGS)
OBJECTS = $(addprefix $(LOUTDIR)/,$(POBJECTS)) $(addprefix $(LOUTDIR)/,$(CMNOBJECTS))
# linker settings
LIBS = $(PLIBS)
-LDFLAGS = $(LDBFLAGS)
+LDFLAGS_ = $(LDFLAGS) $(LDBFLAGS)
$(LOUTDIR)/%.o : %.cxx
- $(CXX) -c $(CXXFLAGS) -o $@ $<
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_) -o $@ $<
$(LOUTDIR)/%.o : %.cc
- $(CXX) -c $(CXXFLAGS) -o $@ $<
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_) -o $@ $<
$(LOUTDIR)/%.o : %.c
- $(CC) -c $(CCFLAGS) -o $@ $<
+ $(CC) -c $(CPPFLAGS) $(CCFLAGS) -o $@ $<
all: $(LOUTDIR)/loch hlp
@@ -203,7 +202,7 @@ hlp:
$(MAKE) -C ./help
$(LOUTDIR)/loch: $(OBJECTS)
- $(CXX) -o $(LOUTDIR)/loch$(EXT) -Wall $(OBJECTS) $(LIBS) $(LDFLAGS)
+ $(CXX) -o $(LOUTDIR)/loch$(EXT) -Wall $(OBJECTS) $(LIBS) $(LDFLAGS_)
$(POSTMAKE)
$(LOUTDIR)/loch.res: loch.rc loch.ico
|
