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