blob: 6d0e204e8b5283ae85a8601d17132b4ccc0a9fe6 (
plain)
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
|
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
all: $(PROGRAM)
$(PROGRAM) : $(OBJECTS)
- $(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldflags` $(CXXFLAGS) $(LDFLAGS)
+ $(CXX) -o $(PROGRAM) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) `fltk-config --ldflags`
configure: configure.in
autoconf
@@ -29,9 +29,9 @@
.SUFFIXES : .fl .do .C .c .H
.C.o :
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
+ $(CXX) $(CXXFLAGS) `fltk-config --cxxflags` -c $<
.C :
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
+ $(CXX) $(CXXFLAGS) `fltk-config --cxxflags` -c $<
.fl.C :
-fluid -c $<
.fl.H :
@@ -42,7 +42,7 @@
@touch makedepend
depend:
- $(MAKEDEPEND) -I.. $(CPPFLAGS) $(CXXFILES) $(CFILES) > makedepend
+ $(MAKEDEPEND) -I.. $(CXXFLAGS) `fltk-config --cxxflags` $(CXXFILES) $(CFILES) > makedepend
makedepend:
touch makedepend
include makedepend
@@ -73,13 +73,13 @@
OBJECTS_D = $(CXXFILES:.C=.do) $(CFILES:.c=.do)
.C.do :
- $(CXX) $(CPPFLAGS) $(CXXFLAGS_D) -c -o $@ $<
+ $(CXX) $(CXXFLAGS) `fltk-config --cxxflags` $(CXXFLAGS_D) -c -o $@ $<
.c.do :
$(CC) $(CFLAGS_D) -c -o $@ $<
$(PROGRAM_D) : $(OBJECTS_D)
- $(CXX) -o $(PROGRAM_D) $(OBJECTS_D) `fltk-config --ldflags` $(CXXFLAGS_D) $(LDFLAGS)
+ $(CXX) -o $(PROGRAM_D) $(CXXFLAGS_D) $(LDFLAGS) $(OBJECTS_D) `fltk-config --ldflags`
# Used to make the version that is gzipped and uploaded to web site
static : $(OBJECTS)
- $(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldstaticflags` $(CXXFLAGS) $(LDFLAGS)
+ $(CXX) -o $(PROGRAM) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) `fltk-config --ldstaticflags`
|
GitWeb
