Index: trunk/INSTALL =================================================================== --- trunk/INSTALL (revision 564) +++ trunk/INSTALL (revision 565) @@ -1,6 +1,6 @@ Standard installation procedure for camv-rnd. -1. install librnd >=3.2.0 and freetype +1. install librnd >=4.0.0 and freetype Either from a source release at http://www.repo.hu/projects/librnd or from VCS: svn checkout svn://svn.repo.hu/librnd/trunk Index: trunk/Makefile.conf.in =================================================================== --- trunk/Makefile.conf.in (revision 564) +++ trunk/Makefile.conf.in (revision 565) @@ -39,7 +39,7 @@ # Where librnd is installed, full path to the .mak file to auto-setup LIBRND_PREFIX=@/local/camv/librnd_prefix@ -LIBRND_MAK=$(LIBRND_PREFIX)/share/librnd3/librnd.mak +LIBRND_MAK=$(LIBRND_PREFIX)/share/librnd4/librnd.mak include $(LIBRND_MAK) @] Index: trunk/config.sh.in =================================================================== --- trunk/config.sh.in (revision 564) +++ trunk/config.sh.in (revision 565) @@ -2,5 +2,5 @@ # *** Autogenerated by scconfig *** DO NOT EDIT *** # camv-rnd config for shell scripts librnd_root=@libs/sul/librnd-3rd/root@ -librnd_libdir=$librnd_root/lib/librnd3 +librnd_libdir=$librnd_root/lib/librnd4 @] Index: trunk/configure =================================================================== --- trunk/configure (revision 564) +++ trunk/configure (revision 565) @@ -4,7 +4,7 @@ then for P in /usr/local /opt/librnd /usr $HOME/usr do - if test -e "$P/include/librnd/core/config.h" + if test -e "$P/include/librnd4/librnd/core/config.h" then LIBRND_PREFIX="$P" break @@ -30,7 +30,7 @@ ;; /usr/include) ;; /usr/local/include) ;; - *) LIBRND_EXTRA_INCLUDE="$LIBRND_PREFIX/include" + *) LIBRND_EXTRA_INCLUDE="$LIBRND_PREFIX/include/librnd4" esac Index: trunk/doc/Makefile =================================================================== --- trunk/doc/Makefile (revision 564) +++ trunk/doc/Makefile (revision 565) @@ -9,7 +9,7 @@ include ../Makefile.conf -SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox +SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd4/scconfig/sccbox user/keytree.svg: $(MENU_RES) $(KEYLIST) $(KEYLIST) --dot user/node_names.txt $(MENU_RES) > user/keytree.dot Index: trunk/doc/developer/Makefile =================================================================== --- trunk/doc/developer/Makefile (revision 564) +++ trunk/doc/developer/Makefile (revision 565) @@ -1,6 +1,6 @@ include ../../Makefile.conf LIBARCHDIR=$(LIBRND_LIBARCHDIR) -SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox +SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd4/scconfig/sccbox all: Index: trunk/doc/developer/packaging/extra.digest =================================================================== --- trunk/doc/developer/packaging/extra.digest (revision 564) +++ trunk/doc/developer/packaging/extra.digest (revision 565) @@ -1,4 +1,4 @@ @appendfiles camv-rnd-core $PREFIX/bin/camv-rnd $PREFIX/share/man/man1/camv-rnd.1 @appendfiles camv-rnd-core $C/conf_core.lht $C/menu.lht -@appenddeps camv-rnd-core librnd3 +@appenddeps camv-rnd-core librnd4 @appendfiles camv-rnd-doc $PREFIX/share/doc/camv-rnd Index: trunk/doc/man/Makefile =================================================================== --- trunk/doc/man/Makefile (revision 564) +++ trunk/doc/man/Makefile (revision 565) @@ -5,7 +5,7 @@ include $(ROOT)/Makefile.conf MAN1DIR=$(install_root)$(DESTDIR)$(PREFIX)/share/man/man1 LIBARCHDIR=$(LIBRND_LIBARCHDIR) -SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox +SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd4/scconfig/sccbox IN=camv-rnd.1.mml OUT_HTML = camv-rnd.1.html Index: trunk/doc/user/Makefile =================================================================== --- trunk/doc/user/Makefile (revision 564) +++ trunk/doc/user/Makefile (revision 565) @@ -1,6 +1,6 @@ include ../../Makefile.conf LIBARCHDIR=$(LIBRND_LIBARCHDIR) -SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox +SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd4/scconfig/sccbox all: Index: trunk/scconfig/Makefile =================================================================== --- trunk/scconfig/Makefile (revision 564) +++ trunk/scconfig/Makefile (revision 565) @@ -87,12 +87,12 @@ sccbox: src/util/sccbox.o $(CC) $(LDFLAGS) -o sccbox src/util/sccbox.o -LIBRNDSCC=$(LIBRND_PREFIX)/include/librnd/scconfig +LIBRNDSCC=$(LIBRND_PREFIX)/include/librnd4/librnd/scconfig RNDHOOKS=$(LIBRNDSCC)/plugin_3state.h $(LIBRNDSCC)/hooks_common.h -hooks.o: $(RNDHOOKS) plugins.h $(LIBRND_PREFIX)/include/librnd/scconfig Rev.h find_fontdir.c +hooks.o: $(RNDHOOKS) plugins.h $(LIBRND_PREFIX)/include/librnd4/librnd/scconfig Rev.h find_fontdir.c -librnd_ver.o: librnd_ver.c $(LIBRND_PREFIX)/include/librnd/config.h +librnd_ver.o: librnd_ver.c $(LIBRND_PREFIX)/include/librnd4/librnd/config.h $(CC) -c $(CFLAGS) -o librnd_ver.o librnd_ver.c $(BIN)/util/arg_auto_set.o: $(SRC)/util/arg_auto_set.c $(SRC)/util/arg_auto_set.h Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 564) +++ trunk/scconfig/hooks.c (revision 565) @@ -21,8 +21,8 @@ #define version "1.1.1-dev" -#define REQ_LIBRND_MAJOR 3 -#define REQ_LIBRND_MINOR 2 +#define REQ_LIBRND_MAJOR 4 +#define REQ_LIBRND_MINOR 0 const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */ @@ -110,7 +110,7 @@ char *tmp; const char *libad; - put("/local/camv/librnd_template", tmp = str_concat("", TO_STR(LIBRND_PREFIX), "/", get("/local/libarchdir"), "/librnd3/scconfig/template", NULL)); + put("/local/camv/librnd_template", tmp = str_concat("", TO_STR(LIBRND_PREFIX), "/", get("/local/libarchdir"), "/librnd4/scconfig/template", NULL)); free(tmp); /* if librnd is installed at some custom path, we'll need to have a -I on CFLAGS and -L on LDFLAGS */ Index: trunk/src/Makefile.depgen =================================================================== --- trunk/src/Makefile.depgen (revision 564) +++ trunk/src/Makefile.depgen (revision 565) @@ -9,51 +9,51 @@ all: echo "### Generated file, do not edit, run make dep ###" > Makefile.dep.tmp echo "" >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/dialogs/dialogs.o -MM $(PLUGDIR)/dialogs/dialogs.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/dialogs/dlg_about.o -MM $(PLUGDIR)/dialogs/dlg_about.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/dialogs/dlg_layer.o -MM $(PLUGDIR)/dialogs/dlg_layer.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/dialogs/dlg_pref_apptab.o -MM $(PLUGDIR)/dialogs/dlg_pref_apptab.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/export_lpr/lpr.o -MM $(PLUGDIR)/export_lpr/lpr.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/export_png/export_png.o -MM $(PLUGDIR)/export_png/export_png.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/export_ps/eps.o -MM $(PLUGDIR)/export_ps/eps.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/export_ps/export_ps.o -MM $(PLUGDIR)/export_ps/export_ps.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/export_ps/ps.o -MM $(PLUGDIR)/export_ps/ps.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/export_svg/export_svg.o -MM $(PLUGDIR)/export_svg/export_svg.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/gui/camv_gui.o -MM $(PLUGDIR)/gui/camv_gui.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/gui/layersel.o -MM $(PLUGDIR)/gui/layersel.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/gui/status.o -MM $(PLUGDIR)/gui/status.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_excellon/excellon.o -MM $(PLUGDIR)/import_excellon/excellon.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gcode/gcode.tab.o -MM $(PLUGDIR)/import_gcode/gcode.tab.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gcode/gcode_exec.o -MM $(PLUGDIR)/import_gcode/gcode_exec.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gcode/gcode_lex.o -MM $(PLUGDIR)/import_gcode/gcode_lex.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gcode/gcode_vm.o -MM $(PLUGDIR)/import_gcode/gcode_vm.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gcode/import_gcode.o -MM $(PLUGDIR)/import_gcode/import_gcode.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gerb/gedraw.o -MM $(PLUGDIR)/import_gerb/gedraw.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gerb/geparse.o -MM $(PLUGDIR)/import_gerb/geparse.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gerb/gerb2camv.o -MM $(PLUGDIR)/import_gerb/gerb2camv.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gerb/gex.tab.o -MM $(PLUGDIR)/import_gerb/gex.tab.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/import_gerb/gexpr.o -MM $(PLUGDIR)/import_gerb/gexpr.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/io_tedax/io_tedax.o -MM $(PLUGDIR)/io_tedax/io_tedax.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/io_tedax/parse.o -MM $(PLUGDIR)/io_tedax/parse.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MT $(PLUGDIR)/std_tools/std_tools.o -MM $(PLUGDIR)/std_tools/std_tools.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp - gcc -MM build_run.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM camv-rnd.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM conf_core.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM crosshair.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM data.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM draw.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM event.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM export.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM gui_act.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM main_act.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM obj_any.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM obj_arc.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM obj_grp.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM obj_line.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM obj_poly.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM obj_text.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM plug_io.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM plug_io_act.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp - gcc -MM rtree.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/dialogs/dialogs.o -MM $(PLUGDIR)/dialogs/dialogs.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/dialogs/dlg_about.o -MM $(PLUGDIR)/dialogs/dlg_about.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/dialogs/dlg_layer.o -MM $(PLUGDIR)/dialogs/dlg_layer.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/dialogs/dlg_pref_apptab.o -MM $(PLUGDIR)/dialogs/dlg_pref_apptab.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/export_lpr/lpr.o -MM $(PLUGDIR)/export_lpr/lpr.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/export_png/export_png.o -MM $(PLUGDIR)/export_png/export_png.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/export_ps/eps.o -MM $(PLUGDIR)/export_ps/eps.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/export_ps/export_ps.o -MM $(PLUGDIR)/export_ps/export_ps.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/export_ps/ps.o -MM $(PLUGDIR)/export_ps/ps.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/export_svg/export_svg.o -MM $(PLUGDIR)/export_svg/export_svg.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/gui/camv_gui.o -MM $(PLUGDIR)/gui/camv_gui.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/gui/layersel.o -MM $(PLUGDIR)/gui/layersel.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/gui/status.o -MM $(PLUGDIR)/gui/status.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_excellon/excellon.o -MM $(PLUGDIR)/import_excellon/excellon.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gcode/gcode.tab.o -MM $(PLUGDIR)/import_gcode/gcode.tab.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gcode/gcode_exec.o -MM $(PLUGDIR)/import_gcode/gcode_exec.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gcode/gcode_lex.o -MM $(PLUGDIR)/import_gcode/gcode_lex.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gcode/gcode_vm.o -MM $(PLUGDIR)/import_gcode/gcode_vm.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gcode/import_gcode.o -MM $(PLUGDIR)/import_gcode/import_gcode.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gerb/gedraw.o -MM $(PLUGDIR)/import_gerb/gedraw.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gerb/geparse.o -MM $(PLUGDIR)/import_gerb/geparse.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gerb/gerb2camv.o -MM $(PLUGDIR)/import_gerb/gerb2camv.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gerb/gex.tab.o -MM $(PLUGDIR)/import_gerb/gex.tab.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/import_gerb/gexpr.o -MM $(PLUGDIR)/import_gerb/gexpr.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/io_tedax/io_tedax.o -MM $(PLUGDIR)/io_tedax/io_tedax.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/io_tedax/parse.o -MM $(PLUGDIR)/io_tedax/parse.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MT $(PLUGDIR)/std_tools/std_tools.o -MM $(PLUGDIR)/std_tools/std_tools.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ -I$(LIBRND)/include/librnd/src_3rd >> Makefile.dep.tmp + gcc -MM build_run.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM camv-rnd.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM conf_core.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM crosshair.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM data.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM draw.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM event.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM export.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM gui_act.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM main_act.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM obj_any.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM obj_arc.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM obj_grp.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM obj_line.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM obj_poly.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM obj_text.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM plug_io.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM plug_io_act.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp + gcc -MM rtree.c -I .. -I ../src -Dinline= -pipe -ansi -pedantic -fPIC -I ../src_3rd -isystem /usr/local/include -isystem /usr/local/include/librnd/src_3rd -isystem /usr/include/freetype2 -isystem /usr/include/freetype2/freetype -D_PCB_DEP_ >> Makefile.dep.tmp sed "s^ librnd/^ $(LIBRND)/^g" < Makefile.dep.tmp > Makefile.dep && rm Makefile.dep.tmp Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 564) +++ trunk/src/Makefile.in (revision 565) @@ -89,7 +89,7 @@ PUPLUG=$(LIBRND_LIBDIR)/puplug SPHASH=$(LIBRND_LIBDIR)/sphash -CQUOTE=$(LIBRND_LIBDIR)/librnd3/scconfig/cquote +CQUOTE=$(LIBRND_LIBDIR)/librnd4/scconfig/cquote RNDLIB_LDLIBS = -lrnd-poly -lrnd-hid -lrnd-3rd @@ -128,7 +128,7 @@ cd $(PLUGDIR) && $(PUPLUG) buildin.c "-" < $(PLUGDIR)/.builtin.pups > ../src/buildin.c conf_core_fields.h: conf_core.h - $(LIBRND_ROOT)/lib/librnd3/scconfig/gen_conf.sh < conf_core.h > conf_core_fields.h + $(LIBRND_ROOT)/lib/librnd4/scconfig/gen_conf.sh < conf_core.h > conf_core_fields.h conf_core.o: conf_core_fields.h