From b113d17eeb3d569f54e67df2bfee85a913658bee Mon Sep 17 00:00:00 2001 From: dickelbeck Date: Mon, 24 Nov 2008 07:12:27 +0000 Subject: [PATCH] makefile tweaks --- common/makefile.include | 66 +++++++-------- eeschema/makefile.include | 173 +++++++++++++++++++------------------- 2 files changed, 121 insertions(+), 118 deletions(-) diff --git a/common/makefile.include b/common/makefile.include index 27646434cb..94728a615a 100644 --- a/common/makefile.include +++ b/common/makefile.include @@ -5,37 +5,37 @@ COMMON = ../include/colors.h OBJECTS= \ - confirm.o \ - base_struct.o\ - copy_to_clipboard.o\ - basicframe.o\ - class_drawpickedstruct.o\ - common_plot_functions.o\ - common_plotPS_functions.o\ - common_plotHPGL_functions.o\ - dlist.o \ - hotkeys_basic.o\ - drawtxt.o \ - about_kicad.o\ - wxwineda.o \ - string.o \ - gr_basic.o\ - gestfich.o\ - trigo.o\ - selcolor.o\ - common.o\ - eda_doc.o\ - toolbars.o\ - displlst.o \ - edaappl.o\ - block_commande.o\ - msgpanel.o\ - projet_config.o\ - get_component_dialog.o\ - eda_dde.o\ - worksheet.o\ - base_screen.o\ - dcsvg.o + confirm.o \ + base_struct.o\ + copy_to_clipboard.o\ + basicframe.o\ + class_drawpickedstruct.o\ + common_plot_functions.o\ + common_plotPS_functions.o\ + common_plotHPGL_functions.o\ + dlist.o \ + hotkeys_basic.o\ + drawtxt.o \ + about_kicad.o\ + wxwineda.o \ + string.o \ + gr_basic.o\ + gestfich.o\ + trigo.o\ + selcolor.o\ + common.o\ + eda_doc.o\ + toolbars.o\ + displlst.o \ + edaappl.o\ + block_commande.o\ + msgpanel.o\ + projet_config.o\ + get_component_dialog.o\ + eda_dde.o\ + worksheet.o\ + base_screen.o\ + dcsvg.o ifdef KICAD_PYTHON OBJECTS += pyhandler.o @@ -87,8 +87,8 @@ trigo.o: trigo.cpp ../include/trigo.h bitmaps.o: bitmaps.cpp ../include/bitmaps.h edaappl.o: edaappl.cpp $(COMMON) ../include/worksheet.h\ - ../include/common.h ../include/gr_basic.h\ - ../include/build_version.h + ../include/common.h ../include/gr_basic.h\ + ../include/build_version.h eda_dde.o: eda_dde.cpp $(COMMON) ../include/eda_dde.h diff --git a/eeschema/makefile.include b/eeschema/makefile.include index 3fec9133b3..40c1f09b21 100644 --- a/eeschema/makefile.include +++ b/eeschema/makefile.include @@ -9,94 +9,97 @@ EXTRALIBS = ../common/common.a ../bitmaps/libbitmaps.a # DEPEND = program.h general.h OBJECTS = eeschema.o\ - schedit.o\ - load_one_schematic_file.o\ - libedit_undo_redo.o\ - schematic_undo_redo.o\ - dialog_create_component.o\ - libedit_onrightclick.o\ - libedit_onleftclick.o\ - dangling_ends.o\ - cross-probing.o\ - setpage.o\ - class_schematic_items.o\ - class_sch_cmp_field.o\ - classes_body_items.o\ - class_drawsheet.o\ - class_pin.o\ - class_hierarchical_PIN_sheet.o\ - class_text-label.o\ - component_class.o\ - class_library.o\ - dialog_options.o\ - tool_lib.o\ - tool_sch.o\ - tool_viewlib.o\ - drawframe.o\ - schframe.o\ - viewlib_frame.o\ - drawpanel.o\ - wxprint.o\ - lib_export.o \ - busentry.o \ - bus-wire-junction.o \ - eelibs_read_libraryfiles.o \ - eelibs_draw_components.o \ - block.o\ - block_libedit.o\ - eeredraw.o\ - dialog_eeschema_config.o\ - eelayer.o \ - priorque.o eeconfig.o \ - affiche.o \ - zoom.o \ - getpart.o\ - netlist.o\ - netlist_control.o\ - edit_label.o\ - edit_component_in_schematic.o\ - locate.o \ - save_schemas.o sheet.o \ - viewlibs.o \ - libedit.o \ - libframe.o \ - symbedit.o \ - pinedit.o \ - libfield.o \ - edit_component_in_lib.o \ - menubar.o \ - savelib.o symbtext.o \ - symbdraw.o \ - hierarch.o files-io.o \ - annotate.o\ - annotate_dialog.o\ - plothpgl.o \ - plot.o libalias.o \ - plotps.o netform.o \ - delsheet.o \ - delete.o\ - build_BOM.o \ - dialog_build_BOM.o \ - erc.o\ - dialog_erc.o\ - selpart.o \ - libarch.o \ - cleanup.o\ - sheetlab.o \ - class_screen.o \ - database.o\ - onrightclick.o \ - onleftclick.o \ - find.o \ - backanno.o \ - controle.o\ - hotkeys.o\ - svg_print.o + schedit.o\ + load_one_schematic_file.o\ + libedit_undo_redo.o\ + schematic_undo_redo.o\ + dialog_create_component.o\ + libedit_onrightclick.o\ + libedit_onleftclick.o\ + dangling_ends.o\ + cross-probing.o\ + setpage.o\ + class_schematic_items.o\ + class_sch_cmp_field.o\ + classes_body_items.o\ + class_drawsheet.o\ + class_pin.o\ + class_hierarchical_PIN_sheet.o\ + class_text-label.o\ + component_class.o\ + class_library.o\ + dialog_options.o\ + tool_lib.o\ + tool_sch.o\ + tool_viewlib.o\ + drawframe.o\ + schframe.o\ + viewlib_frame.o\ + drawpanel.o\ + wxprint.o\ + lib_export.o \ + busentry.o \ + bus-wire-junction.o \ + eelibs_read_libraryfiles.o \ + eelibs_draw_components.o \ + block.o\ + block_libedit.o\ + eeredraw.o\ + dialog_eeschema_config.o\ + eelayer.o \ + priorque.o eeconfig.o \ + affiche.o \ + zoom.o \ + getpart.o\ + netlist.o\ + netlist_control.o\ + edit_label.o\ + edit_component_in_schematic.o\ + dialog_edit_component_in_schematic_fbp.o \ + dialog_edit_component_in_schematic.o \ + locate.o \ + save_schemas.o sheet.o \ + viewlibs.o \ + libedit.o \ + libframe.o \ + symbedit.o \ + pinedit.o \ + libfield.o \ + edit_component_in_lib.o \ + menubar.o \ + savelib.o symbtext.o \ + symbdraw.o \ + hierarch.o files-io.o \ + annotate.o\ + annotate_dialog.o\ + plothpgl.o \ + plot.o libalias.o \ + plotps.o netform.o \ + delsheet.o \ + delete.o\ + build_BOM.o \ + dialog_build_BOM.o \ + erc.o\ + dialog_erc.o\ + selpart.o \ + libarch.o \ + cleanup.o\ + sheetlab.o \ + class_screen.o \ + database.o\ + onrightclick.o \ + onleftclick.o \ + find.o \ + backanno.o \ + controle.o\ + hotkeys.o\ + svg_print.o + eeschema.o: eeschema.cpp program.h general.h $(DEPEND) -edit_component_in_lib.o: edit_component_in_lib.cpp\ - dialog_edit_component_in_lib.cpp dialog_edit_component_in_lib.h $(DEPEND) +#edit_component_in_lib.o: edit_component_in_lib.cpp\ +# dialog_edit_component_in_lib.cpp dialog_edit_component_in_lib.h $(DEPEND) edit_component_in_schematic.o: edit_component_in_schematic.cpp\ dialog_edit_component_in_schematic.cpp dialog_edit_component_in_schematic.h $(DEPEND)