diff -dru kicad-dev/3d-viewer/makefile.gtk kicad-dev-mine/3d-viewer/makefile.gtk --- kicad-dev/3d-viewer/makefile.gtk 2005-05-03 10:40:00.000000000 +0200 +++ kicad-dev-mine/3d-viewer/makefile.gtk 2006-02-19 23:10:20.000000000 +0100 @@ -3,7 +3,7 @@ # 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 -dru kicad-dev/3d-viewer/makefile.macosx kicad-dev-mine/3d-viewer/makefile.macosx --- kicad-dev/3d-viewer/makefile.macosx 2005-07-22 09:34:00.000000000 +0200 +++ kicad-dev-mine/3d-viewer/makefile.macosx 2006-02-19 23:11:46.000000000 +0100 @@ -3,7 +3,7 @@ # 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 -dru kicad-dev/common/makefile.gtk kicad-dev-mine/common/makefile.gtk --- kicad-dev/common/makefile.gtk 2005-05-11 17:21:00.000000000 +0200 +++ kicad-dev-mine/common/makefile.gtk 2006-02-19 23:09:25.000000000 +0100 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -I./ -I../include `wx-config --cflags` EDACPPFLAGS = $(CPPFLAGS) diff -dru kicad-dev/common/makefile.macosx kicad-dev-mine/common/makefile.macosx --- kicad-dev/common/makefile.macosx 2005-07-22 09:34:00.000000000 +0200 +++ kicad-dev-mine/common/makefile.macosx 2006-02-19 23:11:57.000000000 +0100 @@ -2,7 +2,7 @@ CC = gcc # Compiler flags. -CPPFLAGS = -Wall -O2 -I./ -I../include `wx-config --cflags` +CPPFLAGS = -Wall -I./ -I../include `wx-config --cflags` EDACPPFLAGS = $(CPPFLAGS) diff -dru kicad-dev/contrib_makefiles.txt kicad-dev-mine/contrib_makefiles.txt --- kicad-dev/contrib_makefiles.txt 2005-09-20 10:50:00.000000000 +0200 +++ kicad-dev-mine/contrib_makefiles.txt 2006-02-19 23:12:15.000000000 +0100 @@ -1,309 +1,309 @@ libs.dynamic - -CC = `wx-config --cc` -# Note: at least on Debian using gcc gives a smaller binary than using: -# `wx-config --ld` -LD = gcc - -SRCSUFF = .cpp -OBJSUFF = .o -FINAL = 1 - -WXPATH = `wx-config --prefix`/lib -PREFIX_WX_LIBS = `wx-config --basename` -SUFFIX_WX_LIBGL = _gl-$(LIBVERSION) - -LIBSTDC = -lstdc++ -LIBVERSION=`wx-config --release` -WXSYSLIB= `wx-config --libs` - -# attention à l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ - $(EXTRALIBS) $(WXSYSLIB)\ - $(LIBSTDC) - -LIBS3D = -l$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) -lGL -lGLU - -# Sub-projects -KICAD_SUBDIRS = common 3d-viewer eeschema pcbnew cvpcb kicad gerbview wxhtml -# How to invoke make -MAKE := $(MAKE) -f makefile.gtk -# File with the libraries definitions -LIBSDEF = libs.dynamic -# Prefix, can be from command line -ifneq ($(strip $(prefix)),) - IPREFIX=$(prefix) -else - IPREFIX=/usr/local/kicad/linux -endif -# Install tool, can be from command line -ifeq ($(INSTALL),) - INSTALL=install -endif -# C Flags, can be from command line -ifeq ($(CFLAGS),) - CFLAGS=-Wall -O2 - #CFLAGS=-Wall -Werror -g3 -endif -CFLAGS:=$(CFLAGS) `wx-config --cxxflags` -# Linker flags (strip) -LDFLAGS = -s -export - -.PHONY: $(KICAD_SUBDIRS) - -all: $(KICAD_SUBDIRS) - -common: - cd $@ ; $(MAKE) - -3d-viewer: - cd $@ ; $(MAKE) - -eeschema: - cd $@ ; $(MAKE) - -pcbnew: - cd $@ ; $(MAKE) - -cvpcb: - cd $@ ; $(MAKE) - -kicad: - cd $@ ; $(MAKE) - -gerbview: - cd $@ ; $(MAKE) - -wxhtml: - cd $@ ; $(MAKE) - -install: - @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) install); done - -clean: - @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) clean); done - + +CC = `wx-config --cc` +# Note: at least on Debian using gcc gives a smaller binary than using: +# `wx-config --ld` +LD = gcc + +SRCSUFF = .cpp +OBJSUFF = .o +FINAL = 1 + +WXPATH = `wx-config --prefix`/lib +PREFIX_WX_LIBS = `wx-config --basename` +SUFFIX_WX_LIBGL = _gl-$(LIBVERSION) + +LIBSTDC = -lstdc++ +LIBVERSION=`wx-config --release` +WXSYSLIB= `wx-config --libs` + +# attention à l'ordre des libairies +LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ + $(EXTRALIBS) $(WXSYSLIB)\ + $(LIBSTDC) + +LIBS3D = -l$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) -lGL -lGLU + +# Sub-projects +KICAD_SUBDIRS = common 3d-viewer eeschema pcbnew cvpcb kicad gerbview wxhtml +# How to invoke make +MAKE := $(MAKE) -f makefile.gtk +# File with the libraries definitions +LIBSDEF = libs.dynamic +# Prefix, can be from command line +ifneq ($(strip $(prefix)),) + IPREFIX=$(prefix) +else + IPREFIX=/usr/local/kicad/linux +endif +# Install tool, can be from command line +ifeq ($(INSTALL),) + INSTALL=install +endif +# C Flags, can be from command line +ifeq ($(CFLAGS),) + CFLAGS=-Wall + #CFLAGS=-Wall -Werror -g3 +endif +CFLAGS:=$(CFLAGS) `wx-config --cxxflags` +# Linker flags (strip) +LDFLAGS = -s +export + +.PHONY: $(KICAD_SUBDIRS) + +all: $(KICAD_SUBDIRS) + +common: + cd $@ ; $(MAKE) + +3d-viewer: + cd $@ ; $(MAKE) + +eeschema: + cd $@ ; $(MAKE) + +pcbnew: + cd $@ ; $(MAKE) + +cvpcb: + cd $@ ; $(MAKE) + +kicad: + cd $@ ; $(MAKE) + +gerbview: + cd $@ ; $(MAKE) + +wxhtml: + cd $@ ; $(MAKE) + +install: + @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) install); done + +clean: + @for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) clean); done + 3d-viewer/makefile.gtk -## Makefile for 3d-viewer.a ( wxGTK - LINUX ) - -# Compiler flags. -CPPFLAGS = $(CFLAGS) -DPCBNEW -I../pcbnew -I ../include -I../common - -include ../$(LIBSDEF) - -TARGET = 3d-viewer - -all: $(TARGET).a - -include makefile.include - -$(TARGET).a: $(OBJECTS3D) makefile.gtk makefile.include - rm -f $@ - ar -rv $@ $(OBJECTS3D) - ranlib $@ - -clean: - -rm *.o *.a *~ .*~ core *.bak *.exe *.obj 2> /dev/null - -# No install target - -## Makefile for common.a - -# Compiler flags. -CPPFLAGS = $(CFLAGS) -I./ -I../include -EDACPPFLAGS = $(CPPFLAGS) - -all: common.a - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -common.a: $(OBJECTS) makefile.gtk makefile.include - rm -f $@ - ar -rv $@ $(OBJECTS) - ranlib $@ - - -clean: - -rm *.o *.a *~ .*~ core *.bak *.exe *.obj 2> /dev/null - -# No install target - -# File: makefile - -# Compiler flags. -CPPFLAGS = $(CFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - -include ../$(LIBSDEF) - - -TARGET = cvpcb - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF) $(LIBVIEWER3D) - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET) - -install: - $(INSTALL) -d -m 0755 $(IPREFIX) - $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) - -clean: - -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null - -## Makefile for eeschema - -include ../$(LIBSDEF) - -TARGET = eeschema - -CPPFLAGS = $(CFLAGS) - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - -$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF) - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) - -install: - $(INSTALL) -d -m 0755 $(IPREFIX) - $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) - -clean: - -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null - - -## Makefile for GERBVIEW et wxGTK - -# Compiler flags. -CPPFLAGS = $(CFLAGS) - -EXTRALIBS = ../common/common.a -include ../$(LIBSDEF) - - -TARGET = gerbview - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF) - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) - -install: - $(INSTALL) -d -m 0755 $(IPREFIX) - $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) - -clean: - -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null - -# File: makefile for kicad, wxGTK - -# Compiler flags. -CPPFLAGS = $(CFLAGS) - -include ../$(LIBSDEF) - -TARGET = kicad - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) makefile.gtk $(EXTRALIBS) ../$(LIBSDEF) - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) - -install: - $(INSTALL) -d -m 0755 $(IPREFIX) - $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) - -clean: - -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null - -## Makefile for PCBNEW et wxGTK - -# Compiler flags. -CPPFLAGS = $(CFLAGS) - -include ../$(LIBSDEF) - -TARGET = pcbnew - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - -$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../$(LIBSDEF) - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D)\ - -o $(TARGET) - -install: - $(INSTALL) -d -m 0755 $(IPREFIX) - $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) - -clean: - -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null - -######################################################################## -######################################################################## - -# Compiler flags. -CPPFLAGS = $(CFLAGS) -I./ -I../include -I../common - -EXTRALIBS = - -include ../$(LIBSDEF) - -TARGET = wxhtml - -OBJDIR = -OBJSUFF = o - -.SUFFIXES: .cpp .h .o .cc -.cpp.o : - $(CC) -c $< -o $(<:.cpp=.o) $(CPPFLAGS) - - -DEPEND = - - -OBJECTS = $(TARGET).o helpfrm.o - - -$(TARGET): $(OBJECTS) makefile.gtk ../common/common.a ../$(LIBSDEF) - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) - -install: - $(INSTALL) -d -m 0755 $(IPREFIX) - $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) - -clean: - -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null - +## Makefile for 3d-viewer.a ( wxGTK - LINUX ) + +# Compiler flags. +CPPFLAGS = $(CFLAGS) -DPCBNEW -I../pcbnew -I ../include -I../common + +include ../$(LIBSDEF) + +TARGET = 3d-viewer + +all: $(TARGET).a + +include makefile.include + +$(TARGET).a: $(OBJECTS3D) makefile.gtk makefile.include + rm -f $@ + ar -rv $@ $(OBJECTS3D) + ranlib $@ + +clean: + -rm *.o *.a *~ .*~ core *.bak *.exe *.obj 2> /dev/null + +# No install target + +## Makefile for common.a + +# Compiler flags. +CPPFLAGS = $(CFLAGS) -I./ -I../include +EDACPPFLAGS = $(CPPFLAGS) + +all: common.a + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +common.a: $(OBJECTS) makefile.gtk makefile.include + rm -f $@ + ar -rv $@ $(OBJECTS) + ranlib $@ + + +clean: + -rm *.o *.a *~ .*~ core *.bak *.exe *.obj 2> /dev/null + +# No install target + +# File: makefile + +# Compiler flags. +CPPFLAGS = $(CFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + +include ../$(LIBSDEF) + + +TARGET = cvpcb + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF) $(LIBVIEWER3D) + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET) + +install: + $(INSTALL) -d -m 0755 $(IPREFIX) + $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) + +clean: + -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null + +## Makefile for eeschema + +include ../$(LIBSDEF) + +TARGET = eeschema + +CPPFLAGS = $(CFLAGS) + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + +$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF) + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) + +install: + $(INSTALL) -d -m 0755 $(IPREFIX) + $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) + +clean: + -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null + + +## Makefile for GERBVIEW et wxGTK + +# Compiler flags. +CPPFLAGS = $(CFLAGS) + +EXTRALIBS = ../common/common.a +include ../$(LIBSDEF) + + +TARGET = gerbview + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../$(LIBSDEF) + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) + +install: + $(INSTALL) -d -m 0755 $(IPREFIX) + $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) + +clean: + -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null + +# File: makefile for kicad, wxGTK + +# Compiler flags. +CPPFLAGS = $(CFLAGS) + +include ../$(LIBSDEF) + +TARGET = kicad + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) makefile.gtk $(EXTRALIBS) ../$(LIBSDEF) + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) + +install: + $(INSTALL) -d -m 0755 $(IPREFIX) + $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) + +clean: + -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null + +## Makefile for PCBNEW et wxGTK + +# Compiler flags. +CPPFLAGS = $(CFLAGS) + +include ../$(LIBSDEF) + +TARGET = pcbnew + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + +$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../$(LIBSDEF) + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D)\ + -o $(TARGET) + +install: + $(INSTALL) -d -m 0755 $(IPREFIX) + $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) + +clean: + -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null + +######################################################################## +######################################################################## + +# Compiler flags. +CPPFLAGS = $(CFLAGS) -I./ -I../include -I../common + +EXTRALIBS = + +include ../$(LIBSDEF) + +TARGET = wxhtml + +OBJDIR = +OBJSUFF = o + +.SUFFIXES: .cpp .h .o .cc +.cpp.o : + $(CC) -c $< -o $(<:.cpp=.o) $(CPPFLAGS) + + +DEPEND = + + +OBJECTS = $(TARGET).o helpfrm.o + + +$(TARGET): $(OBJECTS) makefile.gtk ../common/common.a ../$(LIBSDEF) + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) + +install: + $(INSTALL) -d -m 0755 $(IPREFIX) + $(INSTALL) -m 0755 $(TARGET) $(IPREFIX) + +clean: + -rm *.o *.a *~ .*~ core *.bak *.exe *.obj $(TARGET) 2> /dev/null + diff -dru kicad-dev/cvpcb/makefile.gtk kicad-dev-mine/cvpcb/makefile.gtk --- kicad-dev/cvpcb/makefile.gtk 2005-07-29 13:13:00.000000000 +0200 +++ kicad-dev-mine/cvpcb/makefile.gtk 2006-02-19 23:10:00.000000000 +0100 @@ -1,39 +1,39 @@ -# File: makefile - -# Compiler flags. -CC = gcc -LD = gcc - -FINAL = 1 - -# Compiler flags. - -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` - -LDFLAGS = -s - -EDACPPFLAGS = $(CPPFLAGS) - -include ../libs.linux - - -TARGET = cvpcb - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux $(LIBVIEWER3D) - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET) - - +# File: makefile + +# Compiler flags. +CC = gcc +LD = gcc + +FINAL = 1 + +# Compiler flags. + +CPPFLAGS = -Wall `wx-config --cxxflags` + +LDFLAGS = -s + +EDACPPFLAGS = $(CPPFLAGS) + +include ../libs.linux + + +TARGET = cvpcb + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux $(LIBVIEWER3D) + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET) + + install: - cp -f $(TARGET) $(KICAD_BIN) + cp -f $(TARGET) $(KICAD_BIN) + +clean: + -erase *.o -clean: - -erase *.o - diff -dru kicad-dev/cvpcb/makefile.macosx kicad-dev-mine/cvpcb/makefile.macosx --- kicad-dev/cvpcb/makefile.macosx 2005-07-29 13:13:00.000000000 +0200 +++ kicad-dev-mine/cvpcb/makefile.macosx 2006-02-19 23:12:30.000000000 +0100 @@ -1,41 +1,41 @@ -# File: makefile - -# Compiler flags. -CC = gcc -LD = g++ - -FINAL = 1 - -# Compiler flags. - -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` - -LDFLAGS = - -EDACPPFLAGS = $(CPPFLAGS) - -include ../libs.macosx - - -TARGET = cvpcb - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx $(LIBVIEWER3D) - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET) - $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r - $(SETFILE) -a C $(TARGET) - - +# File: makefile + +# Compiler flags. +CC = gcc +LD = g++ + +FINAL = 1 + +# Compiler flags. + +CPPFLAGS = -Wall `wx-config --cxxflags` + +LDFLAGS = + +EDACPPFLAGS = $(CPPFLAGS) + +include ../libs.macosx + + +TARGET = cvpcb + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx $(LIBVIEWER3D) + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET) + $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r + $(SETFILE) -a C $(TARGET) + + install: - cp -f $(TARGET) $(KICAD_BIN) + cp -f $(TARGET) $(KICAD_BIN) + +clean: + -erase *.o -clean: - -erase *.o - diff -dru kicad-dev/eeschema/makefile.gtk kicad-dev-mine/eeschema/makefile.gtk --- kicad-dev/eeschema/makefile.gtk 2005-09-09 12:22:00.000000000 +0200 +++ kicad-dev-mine/eeschema/makefile.gtk 2006-02-19 23:07:15.000000000 +0100 @@ -13,7 +13,7 @@ TARGET = eeschema -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` +CPPFLAGS = -Wall `wx-config --cxxflags` all: $(TARGET) diff -dru kicad-dev/eeschema/makefile.macosx kicad-dev-mine/eeschema/makefile.macosx --- kicad-dev/eeschema/makefile.macosx 2005-09-09 12:22:00.000000000 +0200 +++ kicad-dev-mine/eeschema/makefile.macosx 2006-02-19 23:13:16.000000000 +0100 @@ -1,31 +1,31 @@ -## Makefile for eeschema -CC = gcc -LD = g++ - -FINAL = 1 - - -LDFLAGS = - -include ../libs.macosx - -TARGET = eeschema - - -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` - - -all: $(TARGET) netlist_form_pads-pcb - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - -$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) - $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r - $(SETFILE) -a C $(TARGET) +## Makefile for eeschema +CC = gcc +LD = g++ + +FINAL = 1 + + +LDFLAGS = + +include ../libs.macosx + +TARGET = eeschema + + +CPPFLAGS = -Wall `wx-config --cxxflags` + + +all: $(TARGET) netlist_form_pads-pcb + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + +$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) + $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r + $(SETFILE) -a C $(TARGET) netlist_form_pads-pcb: plugins/netlist_form_pads-pcb.cpp @@ -33,17 +33,17 @@ install: - cp $(TARGET) $(KICAD_BIN) - cp netlist_form_pads-pcb $(KICAD_BIN) - - -clean: - rm -f *.o; rm -f *~; rm core; rm *.bak - - - - - - - - + cp $(TARGET) $(KICAD_BIN) + cp netlist_form_pads-pcb $(KICAD_BIN) + + +clean: + rm -f *.o; rm -f *~; rm core; rm *.bak + + + + + + + + diff -dru kicad-dev/gerbview/makefile.gtk kicad-dev-mine/gerbview/makefile.gtk --- kicad-dev/gerbview/makefile.gtk 2005-12-05 09:48:00.000000000 +0100 +++ kicad-dev-mine/gerbview/makefile.gtk 2006-02-19 23:10:35.000000000 +0100 @@ -1,37 +1,37 @@ -## Makefile for GERBVIEW et wxGTK -CC = gcc -LD = gcc - -# Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` - -LDFLAGS = -s - -include ../libs.linux - - -TARGET = gerbview - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux +## Makefile for GERBVIEW et wxGTK +CC = gcc +LD = gcc + +# Compiler flags. +CPPFLAGS = -Wall `wx-config --cxxflags` + +LDFLAGS = -s + +include ../libs.linux + + +TARGET = gerbview + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) -install: - cp $(TARGET) $(KICAD_BIN) - - -clean: - -erase *.o - -erase *.exe - -erase *.res - -erase *.map - - - +install: + cp $(TARGET) $(KICAD_BIN) + + +clean: + -erase *.o + -erase *.exe + -erase *.res + -erase *.map + + + diff -dru kicad-dev/gerbview/makefile.macosx kicad-dev-mine/gerbview/makefile.macosx --- kicad-dev/gerbview/makefile.macosx 2005-07-29 13:13:00.000000000 +0200 +++ kicad-dev-mine/gerbview/makefile.macosx 2006-02-19 23:12:42.000000000 +0100 @@ -1,41 +1,41 @@ -## Makefile for GERBVIEW et wxGTK -CC = gcc -LD = g++ - -# Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` - -LDFLAGS = - -EXTRALIBS = ../common/common.a -include ../libs.macosx - - -TARGET = gerbview - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) - $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r - $(SETFILE) -a C $(TARGET) +## Makefile for GERBVIEW et wxGTK +CC = gcc +LD = g++ + +# Compiler flags. +CPPFLAGS = -Wall `wx-config --cxxflags` + +LDFLAGS = + +EXTRALIBS = ../common/common.a +include ../libs.macosx + + +TARGET = gerbview + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) + $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r + $(SETFILE) -a C $(TARGET) install: - cp $(TARGET) $(KICAD_BIN) - - -clean: - -erase *.o - -erase *.exe - -erase *.res - -erase *.map - - - + cp $(TARGET) $(KICAD_BIN) + + +clean: + -erase *.o + -erase *.exe + -erase *.res + -erase *.map + + + diff -dru kicad-dev/kicad/makefile.gtk kicad-dev-mine/kicad/makefile.gtk --- kicad-dev/kicad/makefile.gtk 2005-07-29 13:13:00.000000000 +0200 +++ kicad-dev-mine/kicad/makefile.gtk 2006-02-19 23:10:53.000000000 +0100 @@ -1,39 +1,39 @@ -# File: makefile for kicad, wxGTK - -# Compiler flags. -CC = gcc -LD = gcc - -FINAL = 1 - -# Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = -s - -include ../libs.linux - -TARGET = kicad - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) makefile.gtk $(EXTRALIBS) ../libs.linux - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) +# File: makefile for kicad, wxGTK + +# Compiler flags. +CC = gcc +LD = gcc + +FINAL = 1 + +# Compiler flags. +CPPFLAGS = -Wall `wx-config --cxxflags` +LDFLAGS = -s + +include ../libs.linux + +TARGET = kicad + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) makefile.gtk $(EXTRALIBS) ../libs.linux + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) install: - cp -f $(TARGET) $(KICAD_BIN) - -clean: - rm -f *.o; rm -f *~; rm core; rm *.bak - - - - - - - + cp -f $(TARGET) $(KICAD_BIN) + +clean: + rm -f *.o; rm -f *~; rm core; rm *.bak + + + + + + + diff -dru kicad-dev/kicad/makefile.macosx kicad-dev-mine/kicad/makefile.macosx --- kicad-dev/kicad/makefile.macosx 2005-07-29 13:13:00.000000000 +0200 +++ kicad-dev-mine/kicad/makefile.macosx 2006-02-19 23:13:32.000000000 +0100 @@ -1,41 +1,41 @@ -# File: makefile for kicad, wxGTK - -# Compiler flags. -CC = gcc -LD = g++ - -FINAL = 1 - -# Compiler flags. -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` -LDFLAGS = - -include ../libs.macosx - -TARGET = kicad - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - -$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx $(EXTRALIBS) ../libs.macosx - $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) - $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r - $(SETFILE) -a C $(TARGET) +# File: makefile for kicad, wxGTK + +# Compiler flags. +CC = gcc +LD = g++ + +FINAL = 1 + +# Compiler flags. +CPPFLAGS = -Wall `wx-config --cxxflags` +LDFLAGS = + +include ../libs.macosx + +TARGET = kicad + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + +$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx $(EXTRALIBS) ../libs.macosx + $(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET) + $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r + $(SETFILE) -a C $(TARGET) install: - cp -f $(TARGET) $(KICAD_BIN) - -clean: - rm -f *.o; rm -f *~; rm core; rm *.bak - - - - - - - + cp -f $(TARGET) $(KICAD_BIN) + +clean: + rm -f *.o; rm -f *~; rm core; rm *.bak + + + + + + + diff -dru kicad-dev/kicad/minizip/makefile kicad-dev-mine/kicad/minizip/makefile --- kicad-dev/kicad/minizip/makefile 2004-06-02 12:18:00.000000000 +0200 +++ kicad-dev-mine/kicad/minizip/makefile 2006-02-19 23:11:20.000000000 +0100 @@ -2,7 +2,7 @@ CC=gcc LD=gcc -CFLAGS=-O2 -Wall -I$(WXDIR)/src/zlib +CFLAGS=-Wall -I$(WXDIR)/src/zlib EXTRALIBS= $(WXDIR)/lib/libwxzlib.a ZIP_OBJS = minizip.o zip.o ioapi.o diff -dru kicad-dev/kicad/minizip/makefile.unx kicad-dev-mine/kicad/minizip/makefile.unx --- kicad-dev/kicad/minizip/makefile.unx 2004-06-02 15:50:00.000000000 +0200 +++ kicad-dev-mine/kicad/minizip/makefile.unx 2006-02-19 23:13:41.000000000 +0100 @@ -2,8 +2,8 @@ CC=gcc LD=gcc -CFLAGS=-O2 -Wall -I$(WXDIR)/src/zlib -#EXTRALIBS= $(WXDIR)/lib/libwxzlib.a +CFLAGS=-Wall -I$(WXDIR)/src/zlib +#EXTRALIBS= $(WXDIR)/lib/libwxzlib.a EXTRALIBS= -lz ZIP_OBJS = minizip.o zip.o ioapi.o diff -dru kicad-dev/kicad/minizip/makefile.win kicad-dev-mine/kicad/minizip/makefile.win --- kicad-dev/kicad/minizip/makefile.win 2004-06-02 15:50:00.000000000 +0200 +++ kicad-dev-mine/kicad/minizip/makefile.win 2006-02-19 23:13:51.000000000 +0100 @@ -2,7 +2,7 @@ CC=gcc LD=gcc -CFLAGS=-O2 -Wall -I$(WXDIR)/src/zlib +CFLAGS=-Wall -I$(WXDIR)/src/zlib EXTRALIBS= $(WXDIR)/lib/libwxzlib.a ZIP_OBJS = minizip.o zip.o ioapi.o diff -dru kicad-dev/makeg95.env kicad-dev-mine/makeg95.env --- kicad-dev/makeg95.env 2005-04-25 11:24:00.000000000 +0200 +++ kicad-dev-mine/makeg95.env 2006-02-19 23:12:59.000000000 +0100 @@ -283,7 +283,7 @@ endif ifeq ($(FINAL),1) - OPT = -O2 -fno-rtti -fno-exceptions + OPT = -fno-rtti -fno-exceptions else OPT = -fno-rtti -fno-exceptions endif diff -dru kicad-dev/pcbnew/makefile.gtk kicad-dev-mine/pcbnew/makefile.gtk --- kicad-dev/pcbnew/makefile.gtk 2005-07-29 13:13:00.000000000 +0200 +++ kicad-dev-mine/pcbnew/makefile.gtk 2006-02-19 23:09:46.000000000 +0100 @@ -1,38 +1,38 @@ -## Makefile for PCBNEW et wxGTK -CC = gcc -LD = gcc - -# Compiler flags. - -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` - -LDFLAGS = -s - -include ../libs.linux - -TARGET = pcbnew - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - - -$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D)\ +## Makefile for PCBNEW et wxGTK +CC = gcc +LD = gcc + +# Compiler flags. + +CPPFLAGS = -Wall `wx-config --cxxflags` + +LDFLAGS = -s + +include ../libs.linux + +TARGET = pcbnew + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + + +$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D)\ -o $(TARGET) -install: - cp $(TARGET) $(KICAD_BIN) - - -clean: - -erase *.o - -erase *.map - - - +install: + cp $(TARGET) $(KICAD_BIN) + + +clean: + -erase *.o + -erase *.map + + + diff -dru kicad-dev/pcbnew/makefile.macosx kicad-dev-mine/pcbnew/makefile.macosx --- kicad-dev/pcbnew/makefile.macosx 2005-07-29 13:13:00.000000000 +0200 +++ kicad-dev-mine/pcbnew/makefile.macosx 2006-02-19 23:11:33.000000000 +0100 @@ -1,38 +1,38 @@ -## Makefile for PCBNEW et wxGTK -CC = gcc -LD = g++ - -# Compiler flags. - -CPPFLAGS = -Wall -O2 `wx-config --cxxflags` - -LDFLAGS = - -include ../libs.macosx - -TARGET = pcbnew - -all: $(TARGET) - -include makefile.include - -CPPFLAGS += $(EXTRACPPFLAGS) -EDACPPFLAGS = $(CPPFLAGS) - - - -$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.macosx - $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET) - $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r - $(SETFILE) -a C $(TARGET) +## Makefile for PCBNEW et wxGTK +CC = gcc +LD = g++ + +# Compiler flags. + +CPPFLAGS = -Wall `wx-config --cxxflags` + +LDFLAGS = + +include ../libs.macosx + +TARGET = pcbnew + +all: $(TARGET) + +include makefile.include + +CPPFLAGS += $(EXTRACPPFLAGS) +EDACPPFLAGS = $(CPPFLAGS) + + + +$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.macosx + $(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET) + $(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r + $(SETFILE) -a C $(TARGET) install: - cp $(TARGET) $(KICAD_BIN) - - -clean: - -erase *.o - -erase *.map - - - + cp $(TARGET) $(KICAD_BIN) + + +clean: + -erase *.o + -erase *.map + + +