Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 9927) +++ trunk/scconfig/Rev.h (revision 9928) @@ -1 +1 @@ -static const int myrev = 9860; +static const int myrev = 9928; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 9927) +++ trunk/scconfig/Rev.tab (revision 9928) @@ -1,3 +1,4 @@ +9928 configure librnd 4.1.0: remove local implementation of functionality moved into librnd 9860 configure io_orcad 9823 configure librnd 4.1.0: switch over to librnd font2 9359 configure drc infrastructure in libcschem Index: trunk/src/libcschem/util_path.c =================================================================== --- trunk/src/libcschem/util_path.c (revision 9927) +++ trunk/src/libcschem/util_path.c (nonexistent) @@ -1,38 +0,0 @@ -/* - * COPYRIGHT - * - * cschem - modular/flexible schematics editor - libcschem (core library) - * Copyright (C) 2023 Tibor 'Igor2' Palinkas - * - * (Supported by NLnet NGI0 Entrust in 2023) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version.* - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Contact: - * Project page: http://repo.hu/projects/sch-rnd - * contact lead developer: http://www.repo.hu/projects/sch-rnd/contact.html - * mailing list: http://www.repo.hu/projects/sch-rnd/contact.html - */ - -#include "config.h" - -#include -#include -#include -#include -#include - -#include "util_path.h" - Index: trunk/src/libcschem/Makefile.dep =================================================================== --- trunk/src/libcschem/Makefile.dep (revision 9927) +++ trunk/src/libcschem/Makefile.dep (revision 9928) @@ -103,8 +103,8 @@ ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h cnc_obj.h \ attrib.h cnc_pen.h ../libcschem/concrete.h cnc_text.h \ - ../libcschem/cnc_text_dyn.h ../libcschem/cnc_text.h undo.h op_common.h \ - operation.h + ../libcschem/cnc_text_dyn.h ../libcschem/cnc_text.h cnc_any_obj.h undo.h \ + op_common.h operation.h cnc_poly.o: cnc_poly.c config.h event.h concrete.h \ ../libcschem/common_types.h ../libcschem/config.h ../libcschem/rtree.h \ ../libcschem/attrib.h ../libcschem/oidpath.h ../libcschem/vtoid.h \ @@ -138,7 +138,7 @@ ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/cnc_text_dyn.h ../libcschem/cnc_text.h cnc_grp.h \ - cnc_text_dyn.h project.h ../libcschem/engine.h util_path.h + cnc_text_dyn.h project.h ../libcschem/engine.h compile.o: compile.c config.h abstract.h ../libcschem/common_types.h \ ../libcschem/config.h ../libcschem/attrib.h TODO.h actions_csch.h \ concrete.h ../libcschem/rtree.h ../libcschem/oidpath.h \ @@ -261,7 +261,7 @@ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h cnc_obj.h \ event.h attrib.h cnc_pen.h cnc_text.h ../libcschem/cnc_text_dyn.h \ ../libcschem/cnc_text.h cnc_any_obj.h concrete.h plug_io.h \ - ../libcschem/abstract.h ../libcschem/TODO.h util_path.h project.h \ + ../libcschem/abstract.h ../libcschem/TODO.h project.h \ ../libcschem/engine.h integrity.h plug_library.o: plug_library.c config.h concrete.h \ ../libcschem/common_types.h ../libcschem/config.h ../libcschem/rtree.h \ @@ -377,7 +377,6 @@ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h engine.h \ project.h ../libcschem/concrete.h ../libcschem/engine.h util_parse.h \ ../libcschem/project.h -util_path.o: util_path.c config.h util_path.h util_project.o: util_project.c config.h project.h \ ../libcschem/common_types.h ../libcschem/config.h \ ../libcschem/concrete.h ../libcschem/rtree.h ../libcschem/attrib.h \ Index: trunk/src/libcschem/Makefile.in =================================================================== --- trunk/src/libcschem/Makefile.in (revision 9927) +++ trunk/src/libcschem/Makefile.in (revision 9928) @@ -54,7 +54,6 @@ util_grp.o util_lib_fs.o util_loclib.o - util_path.o util_parse.o util_project.o util_wirenet.o Index: trunk/src/libcschem/cnc_text_dyn.c =================================================================== --- trunk/src/libcschem/cnc_text_dyn.c (revision 9927) +++ trunk/src/libcschem/cnc_text_dyn.c (revision 9928) @@ -40,7 +40,6 @@ #include "cnc_grp.h" #include "cnc_text_dyn.h" #include "project.h" -#include "util_path.h" RND_INLINE const csch_chdr_t *get_attrib_obj(char **path, const csch_text_t *text) { Index: trunk/src/libcschem/plug_io.c =================================================================== --- trunk/src/libcschem/plug_io.c (revision 9927) +++ trunk/src/libcschem/plug_io.c (revision 9928) @@ -33,7 +33,6 @@ #include "cnc_obj.h" #include "cnc_any_obj.h" #include "plug_io.h" -#include "util_path.h" #include #include #include "project.h" Index: trunk/src/plugins/gui/sheetsel.c =================================================================== --- trunk/src/plugins/gui/sheetsel.c (revision 9927) +++ trunk/src/plugins/gui/sheetsel.c (revision 9928) @@ -46,7 +46,6 @@ #include #include #include -#include #include Index: trunk/src/sch-rnd/Makefile.dep =================================================================== --- trunk/src/sch-rnd/Makefile.dep (revision 9927) +++ trunk/src/sch-rnd/Makefile.dep (revision 9928) @@ -238,7 +238,7 @@ ../../src_3rd/gengeo2d/typecfg_long_double.h ../../src_3rd/opc89.h \ ../../src_3rd/gengeo2d/common.h ../../src_3rd/gengeo2d/prim.h \ ../libcschem/project.h ../libcschem/engine.h ../libcschem/util_project.h \ - ../libcschem/util_path.h ../sch-rnd/multi.h ../plugins/gui/sheetsel.h + ../sch-rnd/multi.h ../plugins/gui/sheetsel.h ../plugins/gui/status.o: ../plugins/gui/status.c ../libcschem/config.h \ ../libcschem/project.h ../libcschem/common_types.h \ ../libcschem/concrete.h ../libcschem/rtree.h ../libcschem/attrib.h \ @@ -1296,8 +1296,7 @@ ../libcschem/plug_library.h ../libcschem/event.h ../libcschem/cnc_grp.h \ ../libcschem/operation.h ../libcschem/concrete.h ../libcschem/project.h \ ../libcschem/engine.h ../libcschem/plug_io.h ../libcschem/abstract.h \ - ../libcschem/TODO.h ../libcschem/util_path.h sheet.h conf_core.h \ - build_run.h multi.h project.h + ../libcschem/TODO.h sheet.h conf_core.h build_run.h multi.h project.h font.o: font.c ../libcschem/config.h ../libcschem/cnc_pen.h \ ../libcschem/concrete.h ../libcschem/common_types.h ../libcschem/rtree.h \ ../libcschem/attrib.h ../libcschem/oidpath.h ../libcschem/vtoid.h \ Index: trunk/src/sch-rnd/file_act.c =================================================================== --- trunk/src/sch-rnd/file_act.c (revision 9927) +++ trunk/src/sch-rnd/file_act.c (revision 9928) @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include