blob: cc29d2f1060e6d5f40e8918d852b827a97cbbe48 (
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
|
Fix parallel make and respect CC, CXX and LDFLAGS
http://bugs.gentoo.org/282244
http://bugs.gentoo.org/317767
--- Makefile
+++ Makefile
@@ -331,8 +331,8 @@
prps: $(PRPS)
-$(PROG): $(OBJS)
- $(CXX) -o $@ $(OBJS) $(LDFLAGS)
+$(PROG): $(OBJS) vlib
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
%.o: %.cpp
$(CXX) $(CFLAGS) -c $< -o $@
--- v/Config.mk
+++ v/Config.mk
@@ -40,8 +40,6 @@
#---------------------------------------------------------------------
#CC = gcc
#CXX = g++
-CC = gcc-3.4
-CXX = g++-3.4
#---------------------------------------------------------------------
# VPATH for dependencies on header files
@@ -302,5 +300,3 @@
#---------------------------------------------------------------------
# LINK/LOAD options
#---------------------------------------------------------------------
-LDFLAGS = $(LIBDIR) $(LIBS)
-
--- v/srcx/Makefile
+++ v/srcx/Makefile
@@ -142,7 +142,6 @@
vprogrsc.h vsliderc.h vtextinc.h vlistc.h vcomboc.h vtextc.h \
vcolor.h vpen.h vclabelc.h vspinc.h
- cd iconed ; $(MAKE) ARCH=$@ ; cd ..
#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
GitWeb
