diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 47e7162f23..46b7d5cc75 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -32,6 +32,6 @@ SET(COMMON_SRCS trigo.cpp worksheet.cpp wxwineda.cpp - ../share/infospgm.cpp) + infospgm.cpp) ADD_LIBRARY(common ${COMMON_SRCS}) diff --git a/share/infospgm.cpp b/common/infospgm.cpp similarity index 100% rename from share/infospgm.cpp rename to common/infospgm.cpp diff --git a/common/makefile.include b/common/makefile.include index 470fc2d41c..3dcbc8e20c 100644 --- a/common/makefile.include +++ b/common/makefile.include @@ -14,6 +14,7 @@ OBJECTS= \ common_plotHPGL_functions.o\ hotkeys_basic.o\ drawtxt.o \ + infospgm.o\ wxwineda.o \ string.o \ gr_basic.o\ diff --git a/cvpcb/makefile.include b/cvpcb/makefile.include index 65bca4c248..6b584e518f 100644 --- a/cvpcb/makefile.include +++ b/cvpcb/makefile.include @@ -34,7 +34,7 @@ OBJECTS = $(TARGET).o \ ioascii.o \ menucfg.o \ cfg.o listlib.o \ - infospgm.o autosel.o \ + autosel.o \ setvisu.o\ dialog_display_options.o\ zoom.o \ @@ -137,9 +137,6 @@ cfg.o: cfg.cpp cfg.h $(DEPEND) menucfg.o: menucfg.cpp dialog_cvpcb_config.cpp dialog_cvpcb_config.h $(DEPEND) -infospgm.o: ../share/infospgm.cpp $(DEPEND) - $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp - autosel.o: autosel.cpp $(DEPEND) setvisu.o: setvisu.cpp $(DEPEND) diff --git a/eeschema/makefile.include b/eeschema/makefile.include index ce6f28a0e0..bd7a2f86f4 100644 --- a/eeschema/makefile.include +++ b/eeschema/makefile.include @@ -69,7 +69,6 @@ OBJECTS = eeschema.o\ plot.o libalias.o \ plotps.o netform.o \ delsheet.o \ - infospgm.o \ delete.o dialog_build_BOM.o \ erc.o\ dialog_erc.o\ @@ -184,6 +183,4 @@ dialog_eeschema_config.o: dialog_eeschema_config.cpp dialog_eeschema_config.h $( libedit.o: libedit.cpp $(DEPEND) -infospgm.o: ../share/infospgm.cpp $(DEPEND) - $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp diff --git a/gerbview/makefile.include b/gerbview/makefile.include index ce6ca7bba9..abe120e613 100644 --- a/gerbview/makefile.include +++ b/gerbview/makefile.include @@ -47,7 +47,6 @@ OBJECTS= \ rs274x.o\ dcode.o\ undelete.o\ - infospgm.o \ files.o\ block.o\ controle.o\ @@ -127,9 +126,6 @@ pcbtexte.o: pcbtexte.cpp $(COMMON) zoom.o: ../share/zoom.cpp $(COMMON) $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp -infospgm.o: ../share/infospgm.cpp $(COMMON) - $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp - affiche.o: affiche.cpp $(COMMON) reglage.o: reglage.cpp $(COMMON) diff --git a/kicad/makefile.include b/kicad/makefile.include index f671c05a33..f40be8fa93 100644 --- a/kicad/makefile.include +++ b/kicad/makefile.include @@ -7,7 +7,6 @@ OBJECTS = kicad.o\ treeprj_frame.o\ treeprj_datas.o\ buildmnu.o\ - infospgm.o\ mainframe.o\ prjconfig.o\ preferences.o\ @@ -29,5 +28,3 @@ mainframe.o: mainframe.cpp $(DEPEND) kicad.h buildmnu.o: buildmnu.cpp $(DEPEND) kicad.h -infospgm.o: ../share/infospgm.cpp $(DEPEND) - $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp diff --git a/pcbnew/makefile.include b/pcbnew/makefile.include index 49d53f8b8c..267c9dd317 100644 --- a/pcbnew/makefile.include +++ b/pcbnew/makefile.include @@ -109,7 +109,6 @@ OBJECTS= $(TARGET).o classpcb.o\ dragsegm.o\ autoplac.o\ files.o\ - infospgm.o\ router.o\ controle.o\ tool_modedit.o\ @@ -214,9 +213,6 @@ loadcmp.o: loadcmp.cpp $(COMMON) zoom.o: ../share/zoom.cpp $(COMMON) $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp -infospgm.o: ../share/infospgm.cpp $(COMMON) - $(CXX) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp - affiche.o: affiche.cpp $(COMMON) tr_modif.o: tr_modif.cpp $(COMMON)