Index: Makefile
===================================================================
--- Makefile	(revision 33284)
+++ Makefile	(revision 33285)
@@ -1,11 +1,11 @@
 # --- configuration part --
 
 # - generic configuration -
-SRC=src
-BIN=src
+SRC=../src_3rd/librnd-local/scconfig/src
+BIN=$(SRC)
 
 #  what cflags to use to compile scconfig
-USER_CFLAGS = -DGENCALL -Isrc -I../src_3rd
+USER_CFLAGS = -DGENCALL -I$(SRC) -I../src_3rd
 #USER_CFLAGS = -Wall -Wextra -g -DGENCALL -Isrc
 
 #  what ldflags to use to link scconfig
@@ -12,56 +12,56 @@
 USER_LDFLAGS =
 
 #  in case hooks.c needs to link to something local
-USER_OBJS = src/util/arg_auto_set.o
+USER_OBJS = $(BIN)/util/arg_auto_set.o
 
 #  what to build - a ./configure
 all: configure cquote
 
 # This line imports scconfig core and default tests
-include src/default/Makefile.plugin
+include $(SRC)/default/Makefile.plugin
 
 #
 # - PLUGINS -
 #
 #  Comment this line if you are not interested in c99 features
-include src/c99/Makefile.plugin
+include $(SRC)/c99/Makefile.plugin
 
 #  Comment this line if you do not need script libs to be detected
-include src/scripts/Makefile.plugin
+include $(SRC)/scripts/Makefile.plugin
 
 #  Comment this line if you do not need parser libs to be detected
-# include src/parser/Makefile.plugin
+# include $(SRC)/parser/Makefile.plugin
 
 #  Comment this line if you do not need to detect parser generators
-include src/parsgen/Makefile.plugin
+include $(SRC)/parsgen/Makefile.plugin
 
 #  Comment this line if you do not need math related libs
-include src/math/Makefile.plugin
+include $(SRC)/math/Makefile.plugin
 
 #  Comment this line if you do not need socket/networking
-include src/socket/Makefile.plugin
+include $(SRC)/socket/Makefile.plugin
 
 #  Comment this line if you do not need user/password API detection
-include src/userpass/Makefile.plugin
+include $(SRC)/userpass/Makefile.plugin
 
 #  Comment this line if you do not need gui (X11, toolkits)
-include src/gui/Makefile.plugin
+include $(SRC)/gui/Makefile.plugin
 
 #  Comment this line if you do not need software utility libs (glib)
-include src/sul/Makefile.plugin
+include $(SRC)/sul/Makefile.plugin
 
 #  Uncomment this line if you need menus
-include src/menulib/Makefile.plugin
+include $(SRC)/menulib/Makefile.plugin
 
 #  Comment this line if you do not need generator (templating)
-include src/generator/Makefile.plugin.legacy
+include $(SRC)/generator/Makefile.plugin.legacy
 
 #  Comment this line if you do not need tmpasm (templating)
-include src/tmpasm/Makefile.plugin
+include $(SRC)/tmpasm/Makefile.plugin
 
 # --- you shouldn't edit the lines below ---
 OBJS = $(USER_OBJS) hooks.o $(DEFAULT_NOMAIN_OBJS) $(SCRIPT_OBJS) $(PARSER_OBJS) $(GENERATOR_OBJS) $(TMPASM_OBJS) $(C99_OBJS) $(PARSGEN_OBJS) $(MATH_OBJS) $(SOCKET_OBJS) $(USERPASS_OBJS) $(GUI_OBJS) $(SUL_OBJS)
-CFLAGS = $(USER_CFLAGS) $(DEFAULT_CFLAGS) $(SCRIPT_CFLAGS) $(PARSER_CFLAGS) $(GENERATOR_CFLAGS) $(TMPASM_CFLAGS) $(C99_CFLAGS) $(PARSGEN_CFLAGS) $(MATH_CFLAGS) $(SOCKET_CFLAGS) $(USERPASS_CFLAGS) $(GUI_CFLAGS)  $(SUL_CFLAGS) $(MENULIB_CFLAGS) -Isrc/default -I.
+CFLAGS = $(USER_CFLAGS) $(DEFAULT_CFLAGS) $(SCRIPT_CFLAGS) $(PARSER_CFLAGS) $(GENERATOR_CFLAGS) $(TMPASM_CFLAGS) $(C99_CFLAGS) $(PARSGEN_CFLAGS) $(MATH_CFLAGS) $(SOCKET_CFLAGS) $(USERPASS_CFLAGS) $(GUI_CFLAGS)  $(SUL_CFLAGS) $(MENULIB_CFLAGS) -I$(SRC)/default -I.
 LDFLAGS = $(USER_LDFLAGS) $(DEFAULT_LDFLAGS) $(SCRIPT_LDFLAGS) $(PARSER_LDFLAGS) $(GENERATOR_LDFLAGS) $(TMPASM_LDFLAGS) $(C99_LDFLAGS) $(PARSGEN_LDFLAGS) $(MATH_LDFLAGS) $(SOCKET_LDFLAGS) $(USERPASS_LDFLAGS) $(GUI_LDFLAGS) $(SUL_LDFLAGS) $(MENULIB_LDFLAGS)
 
 all: configure revtest sccbox
@@ -78,8 +78,8 @@
 menuconfig: menucfg
 	./menucfg
 
-menucfg: $(OBJS) $(MENULIB_OBJS) src/default/main_lib.o src/default/main_custom_args.o menucfg.o src/util/arg_auto_menu.o src/util/arg_auto_set.o
-	$(CC) -o menucfg $(OBJS) $(MENULIB_OBJS) menucfg.o src/default/main_lib.o src/default/main_custom_args.o src/util/arg_auto_menu.o
+menucfg: $(OBJS) $(MENULIB_OBJS) $(BIN)/default/main_lib.o $(BIN)/default/main_custom_args.o menucfg.o $(BIN)/util/arg_auto_menu.o $(BIN)/util/arg_auto_set.o
+	$(CC) -o menucfg $(OBJS) $(MENULIB_OBJS) menucfg.o $(BIN)/default/main_lib.o $(BIN)/default/main_custom_args.o $(BIN)/util/arg_auto_menu.o
 
 menucfg.o: menucfg.c
 	$(CC) -c $(CFLAGS) -o menucfg.o menucfg.c
@@ -88,20 +88,20 @@
 RNDHOOKS=$(LIBRNDSCC)/plugin_3state.h $(LIBRNDSCC)/hooks_common.h $(LIBRNDSCC)/hooks_gui.c $(LIBRNDSCC)/rnd_hook_detect.h
 hooks.o: hooks.c $(RNDHOOKS)  plugins.h Rev.h ../src_3rd/puplug/scconfig_hooks.h ../src_3rd/libfungw/scconfig_hooks.h ../src_3rd/libporty_net/hooks_net.c
 
-src/util/arg_auto_set.o: src/util/arg_auto_set.c src/util/arg_auto_set.h
-	$(CC) -c $(CFLAGS) -o src/util/arg_auto_set.o src/util/arg_auto_set.c
+$(BIN)/util/arg_auto_set.o: $(SRC)/util/arg_auto_set.c $(SRC)/util/arg_auto_set.h
+	$(CC) -c $(CFLAGS) -o $(BIN)/util/arg_auto_set.o $(SRC)/util/arg_auto_set.c
 
-src/util/sccbox.o: src/util/sccbox.c
-	$(CC) -c $(CFLAGS) -o src/util/sccbox.o src/util/sccbox.c
+$(BIN)/util/sccbox.o: $(SRC)/util/sccbox.c
+	$(CC) -c $(CFLAGS) -o $(BIN)/util/sccbox.o $(SRC)/util/sccbox.c
 
-sccbox: src/util/sccbox.o
-	$(CC) $(LDFLAGS) -o sccbox src/util/sccbox.o
+sccbox: $(BIN)/util/sccbox.o
+	$(CC) $(LDFLAGS) -o sccbox $(BIN)/util/sccbox.o
 
-cquote: src/util/cquote.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o cquote src/util/cquote.c
+cquote: $(SRC)/util/cquote.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o cquote $(SRC)/util/cquote.c
 
 clean:
-	-rm $(OBJS) $(DEFAULT_MAIN_OBJS) configure revtest revtest.o cquote core src/util/sccbox.o
+	-rm $(OBJS) $(DEFAULT_MAIN_OBJS) configure revtest revtest.o cquote core $(BIN)/util/sccbox.o
 
 distclean:
 	-rm ../config.h ../Makefile.conf ../src/Makefile ../util/gsch2pcb-rnd/Makefile config.cache config.log Rev.stamp sccbox gmon.out ../src_3rd/puplug/Makefile ../src_3rd/puplug/config.h ../src_plugins/lib_hid_gl/opengl.h