Rename program permute to permute_conf

11 files changed, 12 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 0211910..730f8d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-.PHONY: all help parse_kconfig write_config build run test clean clean_linux clean_buildroot mlinux mbuildroot deflinux distclean_linux distclean_buildroot distclean picosat init initialize permute
+.PHONY: all help parse_kconfig write_config build run test clean clean_linux clean_buildroot mlinux mbuildroot deflinux distclean_linux distclean_buildroot distclean picosat init initialize permute_conf
 
 -include .conf.mk
 
-all: parse_kconfig write_config permute picosat
+all: parse_kconfig write_config permute_conf picosat
 
 help:
 	@echo "all         - Builds basic programs and prints message about next steps."
@@ -40,8 +40,8 @@ mlinux:
 deflinux:
 	ARCH=$(ARCH) $(MAKE) -C linux defconfig
 
-mpermute: permute
-	cd linux && SRCARCH=$(ARCH) ARCH=$(ARCH) KERNELVERSION=$(ARCH) ../scripts/permute/permute Kconfig
+mpermute_conf: permute_conf
+	cd linux && SRCARCH=$(ARCH) ARCH=$(ARCH) KERNELVERSION=$(ARCH) ../scripts/permute_conf/permute_conf Kconfig
 
 init: initialize
 initialize: parse_kconfig picosat
@@ -59,6 +59,7 @@ evaluate:
 clean:
 	@$(MAKE) -C scripts/parse_kconfig clean
 	@$(MAKE) -C scripts/write_config clean
+	@$(MAKE) -C scripts/permute_conf clean
 	@if [ -e scripts/picosat-959/makefile ]; then $(MAKE) -C scripts/picosat-959 clean; fi
 	$(RM) .conf.mk
 	$(RM) -r jobfiles output result
@@ -89,8 +90,8 @@ parse_kconfig:
 write_config:
 	@$(MAKE) -C scripts/write_config/
 
-permute:
-	@$(MAKE) -C scripts/permute/
+permute_conf:
+	@$(MAKE) -C scripts/permute_conf/
 
 buildroot/.config:
 	cp $(BUILDROOT_DEF_CONFIG) $@
diff --git a/scripts/permute/.gitignore b/scripts/permute/.gitignore
deleted file mode 100644
index 4456899..0000000
--- a/scripts/permute/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-permute
diff --git a/scripts/permute_conf/.gitignore b/scripts/permute_conf/.gitignore
new file mode 100644
index 0000000..7fe1c05
--- /dev/null
+++ b/scripts/permute_conf/.gitignore
@@ -0,0 +1 @@
+permute_conf
diff --git a/scripts/permute/Makefile b/scripts/permute_conf/Makefile
index 531b484..e0f7cd2 100644
--- a/scripts/permute/Makefile
+++ b/scripts/permute_conf/Makefile
@@ -2,12 +2,12 @@ MAKEFLAGS += --no-builtin-rules
 .PHONY: all clean
 .SUFFIXES:
 
-all: permute
+all: permute_conf
 
 KCONFIG_PREFIX = ../shared/kconfig
 include $(KCONFIG_PREFIX)/files.mk
 
-SRC  = permute.c \
+SRC  = permute_conf.c \
 	   menudata.c \
 	   dotconf.c
 OBJ = $(patsubst %.c,%.o,$(SRC))
@@ -17,9 +17,9 @@ INCLUDES = -I../shared
 %.o: %.c
 	gcc -c $(CFLAGS) -o $@ $^ $(INCLUDES)
 
-permute: $(OBJ) $(KCONFIG_OBJ)
+permute_conf: $(OBJ) $(KCONFIG_OBJ)
 	gcc -o $@ $^
 
 clean::
 	$(RM) $(OBJ)
-	$(RM) permute
+	$(RM) permute_conf
diff --git a/scripts/permute/constlist.h b/scripts/permute_conf/constlist.h
index 01f172a..01f172a 100644
--- a/scripts/permute/constlist.h
+++ b/scripts/permute_conf/constlist.h
diff --git a/scripts/permute/dotconf.c b/scripts/permute_conf/dotconf.c
index bf8e067..bf8e067 100644
--- a/scripts/permute/dotconf.c
+++ b/scripts/permute_conf/dotconf.c
diff --git a/scripts/permute/dotconf.h b/scripts/permute_conf/dotconf.h
index 34fa8db..34fa8db 100644
--- a/scripts/permute/dotconf.h
+++ b/scripts/permute_conf/dotconf.h
diff --git a/scripts/permute/menudata.c b/scripts/permute_conf/menudata.c
index 88910ab..88910ab 100644
--- a/scripts/permute/menudata.c
+++ b/scripts/permute_conf/menudata.c
diff --git a/scripts/permute/menudata.h b/scripts/permute_conf/menudata.h
index a273891..a273891 100644
--- a/scripts/permute/menudata.h
+++ b/scripts/permute_conf/menudata.h
diff --git a/scripts/permute/permute.c b/scripts/permute_conf/permute_conf.c
index ec9abf0..ec9abf0 100644
--- a/scripts/permute/permute.c
+++ b/scripts/permute_conf/permute_conf.c
diff --git a/scripts/permute/permutelist.h b/scripts/permute_conf/permutelist.h
index 725f6d6..725f6d6 100644
--- a/scripts/permute/permutelist.h
+++ b/scripts/permute_conf/permutelist.h