Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6844) +++ trunk/scconfig/Rev.h (revision 6845) @@ -1 +1 @@ -static const int myrev = 6740; +static const int myrev = 6844; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6844) +++ trunk/scconfig/Rev.tab (revision 6845) @@ -1,3 +1,4 @@ +6844 configure removed excess librnd detection 6740 configure new dialog box: project properties edit 6720 configure new libcschem source file for project support 6294 configure remove excess export API Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 6844) +++ trunk/scconfig/hooks.c (revision 6845) @@ -156,8 +156,6 @@ require("sys/types/size/4_u_int", 0, 1); - require("libs/sul/librnd-hid/*", 0, 1); - /* yacc/lex - are we able to regenerate languages? */ if (istrue(get("/local/csch/want_bison"))) { require("parsgen/flex/*", 0, 0); Index: trunk/src/libcschem/Makefile.in =================================================================== --- trunk/src/libcschem/Makefile.in (revision 6844) +++ trunk/src/libcschem/Makefile.in (revision 6845) @@ -72,9 +72,9 @@ print [@ ROOT=@/local/csch/root@ +include $(ROOT)/Makefile.conf +include $(LIBRND_MAK) -include @libs/sul/librnd-3rd/mak@ - CC=@cc/cc@ CFLAGS=@/local/csch/CFLAGS@ @/local/csch/c89flags@ @?/local/rnd/CFLAGS@ $(CFLAGS_LIBRND) @?/local/csch/librnd_extra_inc@ C89FLAGS=$(CFLAGS) Index: trunk/src/libcschem/config.sh.in =================================================================== --- trunk/src/libcschem/config.sh.in (revision 6844) +++ trunk/src/libcschem/config.sh.in (revision 6845) @@ -1,6 +1,6 @@ print [@ # *** Autogenerated by scconfig *** DO NOT EDIT *** # cschem config for shell scripts -librnd_root=@libs/sul/librnd-3rd/root@ -librnd_libdir=$librnd_root/lib/librnd3 +librnd_root=@/local/csch/librnd_prefix@ +librnd_libdir=$librnd_root/lib/librnd4 @] Index: trunk/src/sch-rnd/Makefile.in =================================================================== --- trunk/src/sch-rnd/Makefile.in (revision 6844) +++ trunk/src/sch-rnd/Makefile.in (revision 6845) @@ -90,8 +90,9 @@ ### Makefile ### print [@ -LIBRND_ROOT=@libs/sul/librnd-3rd/root@ -include @libs/sul/librnd-3rd/mak@ +ROOT=@/local/csch/root@ +include $(ROOT)/Makefile.conf +include $(LIBRND_MAK) RNDLIB_LDLIBS = -lrnd-hid -lrnd-font -lrnd-poly -lrnd-core -lrnd-3rd ROOT=@/local/csch/root@