diff -Nadurp kicad-dev/3d-viewer/makefile.gtk kicad-dev-gentoo/3d-viewer/makefile.gtk
--- kicad-dev/3d-viewer/makefile.gtk	2005-05-03 10:40:20.000000000 +0200
+++ kicad-dev-gentoo/3d-viewer/makefile.gtk	2006-04-01 19:50:15.000000000 +0200
@@ -1,9 +1,9 @@
 ## Makefile for 3d-viewer.a ( wxGTK - LINUX )
-CC = gcc
+CC = gcc $(CFLAGS)
 
 # Compiler flags.
 
-CPPFLAGS =  -Wall -O2 -DPCBNEW  -I../pcbnew -I ../include -I../common\
+CPPFLAGS =  -Wall -DPCBNEW  -I../pcbnew -I ../include -I../common\
 	  `wx-config --cxxflags`
 
 
diff -Nadurp kicad-dev/common/makefile.gtk kicad-dev-gentoo/common/makefile.gtk
--- kicad-dev/common/makefile.gtk	2005-05-11 17:21:30.000000000 +0200
+++ kicad-dev-gentoo/common/makefile.gtk	2006-04-01 19:50:15.000000000 +0200
@@ -1,8 +1,8 @@
 ## Makefile for common.a
-CC = gcc
+CC = gcc $(CFLAGS)
 
 # Compiler flags.
-CPPFLAGS =  -Wall -O2 -I./ -I../include `wx-config --cflags`
+CPPFLAGS =  -Wall -I./ -I../include `wx-config --cflags`
 
 EDACPPFLAGS = $(CPPFLAGS)
 
diff -Nadurp kicad-dev/cvpcb/makefile.gtk kicad-dev-gentoo/cvpcb/makefile.gtk
--- kicad-dev/cvpcb/makefile.gtk	2006-03-20 13:31:36.000000000 +0100
+++ kicad-dev-gentoo/cvpcb/makefile.gtk	2006-04-01 19:50:15.000000000 +0200
@@ -1,14 +1,14 @@
 # File:		makefile
 
 # Compiler flags.
-CC = gcc
-LD = gcc
+CC = gcc $(CFLAGS)
+LD = c++
 
 FINAL = 1
 
 # Compiler flags.
 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS = -Wall `wx-config --cxxflags`
 
 LDFLAGS =  -s
 
diff -Nadurp kicad-dev/eeschema/makefile.gtk kicad-dev-gentoo/eeschema/makefile.gtk
--- kicad-dev/eeschema/makefile.gtk	2005-09-09 12:22:04.000000000 +0200
+++ kicad-dev-gentoo/eeschema/makefile.gtk	2006-04-01 19:50:15.000000000 +0200
@@ -1,7 +1,7 @@
 ## Makefile for eeschema
-CC = gcc
+CC = gcc $(CFLAGS)
 #LD = c++ pour utiliser libstdc++ dynamique
-LD = gcc
+LD = c++
 
 FINAL = 1
 
@@ -13,7 +13,7 @@ include ../libs.linux
 TARGET = eeschema
 
 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS = -Wall `wx-config --cxxflags`
 
 
 all: $(TARGET)
@@ -27,7 +27,7 @@ $(TARGET):  $(OBJECTS) makefile.gtk make
 	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBS) -o $(TARGET)
 
 netlist_form_pads-pcb: plugins/netlist_form_pads-pcb.cpp makefile.gtk
-	gcc -D__UNIX__ -Wall plugins/netlist_form_pads-pcb.cpp $(LIBSTDC) -o netlist_form_pads-pcb
+	gcc $(CFLAGS) -D__UNIX__ -Wall plugins/netlist_form_pads-pcb.cpp $(LIBSTDC) -o netlist_form_pads-pcb
 
 
 install:
diff -Nadurp kicad-dev/eeschema/plugins/makefile.gtk kicad-dev-gentoo/eeschema/plugins/makefile.gtk
--- kicad-dev/eeschema/plugins/makefile.gtk	2005-09-09 12:31:20.000000000 +0200
+++ kicad-dev-gentoo/eeschema/plugins/makefile.gtk	2006-04-01 19:50:34.000000000 +0200
@@ -16,7 +16,7 @@ endif
 all: netlist_form_pads-pcb
 
 netlist_form_pads-pcb: netlist_form_pads-pcb.cpp makefile.gtk
-	gcc -D__UNIX__  -Wall netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb $(LIBSTDC)
+	gcc $(CFLAGS) -D__UNIX__  -Wall netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb $(LIBSTDC)
 
 install:
 	cp -v netlist_form_pads-pcb $(KICAD_BIN)/plugins/
diff -Nadurp kicad-dev/gerbview/makefile.gtk kicad-dev-gentoo/gerbview/makefile.gtk
--- kicad-dev/gerbview/makefile.gtk	2005-12-05 09:48:00.000000000 +0100
+++ kicad-dev-gentoo/gerbview/makefile.gtk	2006-04-01 19:50:15.000000000 +0200
@@ -1,9 +1,9 @@
 ## Makefile for GERBVIEW et wxGTK
-CC = gcc
-LD = gcc
+CC = gcc $(CFLAGS)
+LD = c++
 
 # Compiler flags.
-CPPFLAGS =  -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS =  -Wall `wx-config --cxxflags`
 
 LDFLAGS = -s
 
diff -Nadurp kicad-dev/kicad/makefile.gtk kicad-dev-gentoo/kicad/makefile.gtk
--- kicad-dev/kicad/makefile.gtk	2005-07-29 13:13:38.000000000 +0200
+++ kicad-dev-gentoo/kicad/makefile.gtk	2006-04-01 19:50:15.000000000 +0200
@@ -1,13 +1,13 @@
 # File:		makefile for kicad, wxGTK
 
 # Compiler flags.
-CC = gcc
-LD = gcc
+CC = gcc $(CFLAGS)
+LD = c++
 
 FINAL = 1
 
 # Compiler flags.
-CPPFLAGS =  -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS =  -Wall `wx-config --cxxflags`
 LDFLAGS =  -s
 
 include ../libs.linux
diff -Nadurp kicad-dev/libs.linux kicad-dev-gentoo/libs.linux
--- kicad-dev/libs.linux	2006-03-28 12:30:46.000000000 +0200
+++ kicad-dev-gentoo/libs.linux	2006-04-01 19:51:35.000000000 +0200
@@ -64,8 +64,8 @@ WXSYSLIB_WITH_GL= $(WXPATH)/$(PREFIX_WX_
         -L/usr/lib
 else
 #or use "standard command" for wxWidgets
-WXSYSLIB= `wx-config --libs`
-WXSYSLIB_WITH_GL= `wx-config --libs gl`
+WXSYSLIB= `wx-config --libs core,base,net,html,xrc`
+WXSYSLIB_WITH_GL= `wx-config --libs core,base,net,html,gl`
 endif
 
 
diff -Nadurp kicad-dev/makefile.gtk kicad-dev-gentoo/makefile.gtk
--- kicad-dev/makefile.gtk	2005-09-09 12:21:58.000000000 +0200
+++ kicad-dev-gentoo/makefile.gtk	2006-04-01 19:49:17.000000000 +0200
@@ -1,7 +1,7 @@
 KICAD_SUBDIRS =  common 3d-viewer eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
 KICAD_SUBDIRS_BIN =  eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
 # How to invoke make:
-MAKE = make -k -f makefile.gtk
+MAKE = make -f makefile.gtk
 MAKE_INSTALL = make -f makefile.gtk install
 ERASE = rm -f *.o
 
diff -Nadurp kicad-dev/pcbnew/makefile.gtk kicad-dev-gentoo/pcbnew/makefile.gtk
--- kicad-dev/pcbnew/makefile.gtk	2006-03-20 13:31:34.000000000 +0100
+++ kicad-dev-gentoo/pcbnew/makefile.gtk	2006-04-01 19:50:15.000000000 +0200
@@ -1,10 +1,10 @@
 ## Makefile for PCBNEW et wxGTK
-CC = gcc
-LD = gcc
+CC = gcc $(CFLAGS)
+LD = c++
 
 # Compiler flags.
 
-CPPFLAGS = -Wall -O2 `wx-config --cxxflags`
+CPPFLAGS = -Wall `wx-config --cxxflags`
 
 LDFLAGS = -s