Autogenerated h

diff --git a/diff.h b/diff.h
deleted file mode 100644 (file)
index 9248740..0000000
--- a/diff.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-diff.h
-see the difference!
-29.11.2022
-
-Copyright (C) 2022  Balthasar Szczepański
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-Requires Dev Image Library (libdevil) (http://openil.sourceforge.net/)
-on Pentium III libdevil must be recompiled with
---disable-ssl2 --disable-ssl3
-(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572954)
-*/
-
-int subtool_diff (int argc, char **argv, int argi, char **err);

diff --git a/info.h b/info.h
deleted file mode 100644 (file)
index 8c93d3a..0000000
--- a/info.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-info.h
-Get information
-13.11.2022
-
-Copyright (C) 2022  Balthasar Szczepański
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-Requires Dev Image Library (libdevil) (http://openil.sourceforge.net/)
-on Pentium III libdevil must be recompiled with
---disable-ssl2 --disable-ssl3
-(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572954)
-*/
-
-int subtool_info (int argc, char **argv, int argi, char **err);

diff --git a/makefile b/makefile
index 19e31b4a0e8cb7b05b8f2e6e5efedeab92a83651..8f38326f4fd499f75e83001708cf19becf3bd8af 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 # "makefile" is automatically generated from "makefile.1.mak"
-# 30.11.2022
+# 01.12.2022
 # 
 # Copyright (C) 2022  Balthasar Szczepański
 # 
@@ -101,8 +101,11 @@ enhance: enhance.c core.h core.c $(H_SUBTOOL) $(C_SUBTOOL) $(H_PNG)
 $(STANDALONE): %: standalone-%.c %.c %.h core.c core.h $(H_PNG)
        $(CC) $(CF) -o $@ standalone-$*.c $*.c core.c $(L_IL)
 
-$(C_STANDALONE): standalone-%.c: settings-standalone.txt standalone.c
-       $(CONFIGURE) subtool=$* settings-standalone.txt --in standalone.c --out $@
+$(C_STANDALONE): standalone-%.c: settings-subtool.txt standalone.c
+       $(CONFIGURE) subtool=$* settings-subtool.txt --in standalone.c --out $@
+
+$(H_SUBTOOL): %.h: settings-subtool.txt subtool.h
+       $(CONFIGURE) subtool=$* settings-subtool.txt --in subtool.h --out $@
 
 $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)
        $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
@@ -118,7 +121,7 @@ f2h: f2h.c
 #      $(CC) $(CF) -o test test.c core.c $(LF)
 
 clean:
-       $(RM) -f enhance $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG)
+       $(RM) -f enhance $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL)
 
 PHONY: all clean
 

diff --git a/makefile.1.mak b/makefile.1.mak
index 93bb701f5b9a0939b8971c17e46316ace157bb3f..01c7dca8557fde9fde783c292873336a6e3843f1 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -1,5 +1,5 @@
 # "makefile" is automatically generated from "makefile.1.mak"
-# 30.11.2022
+# 01.12.2022
 # 
 # Copyright (C) 2022  Balthasar Szczepański
 # 
@@ -101,8 +101,11 @@ enhance: enhance.c core.h core.c $(H_SUBTOOL) $(C_SUBTOOL) $(H_PNG)
 $(STANDALONE): %: standalone-%.c %.c %.h core.c core.h $(H_PNG)
        $(CC) $(CF) -o $@ standalone-$*.c $*.c core.c $(L_IL)
 
-$(C_STANDALONE): standalone-%.c: settings-standalone.txt standalone.c
-       $(CONFIGURE) subtool=$* settings-standalone.txt --in standalone.c --out $@
+$(C_STANDALONE): standalone-%.c: settings-subtool.txt standalone.c
+       $(CONFIGURE) subtool=$* settings-subtool.txt --in standalone.c --out $@
+
+$(H_SUBTOOL): %.h: settings-subtool.txt subtool.h
+       $(CONFIGURE) subtool=$* settings-subtool.txt --in subtool.h --out $@
 
 $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)
        $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
@@ -118,7 +121,7 @@ f2h: f2h.c
 #      $(CC) $(CF) -o test test.c core.c $(LF)
 
 clean:
-       $(RM) -f enhance $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG)
+       $(RM) -f enhance $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL)
 
 PHONY: all clean
 

diff --git a/nofading.h b/nofading.h
deleted file mode 100644 (file)
index 982f224..0000000
--- a/nofading.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-nofading.h
-The tool with multiple enhancements and manipulations of pictures
-13.11.2022
-
-Copyright (C) 2022  Balthasar Szczepański
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-Requires Dev Image Library (libdevil) (http://openil.sourceforge.net/)
-on Pentium III libdevil must be recompiled with
---disable-ssl2 --disable-ssl3
-(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572954)
-*/
-
-int subtool_nofading (int argc, char **argv, int argi, char **err);

diff --git a/npb.h b/npb.h
deleted file mode 100644 (file)
index c2c95f3..0000000
--- a/npb.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-npb.h
-Take a picture and add a newpixbot to it!
-29.11.2022
-
-Copyright (C) 2022  Balthasar Szczepański
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-Requires Dev Image Library (libdevil) (http://openil.sourceforge.net/)
-on Pentium III libdevil must be recompiled with
---disable-ssl2 --disable-ssl3
-(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572954)
-*/
-
-int subtool_npb (int argc, char **argv, int argi, char **err);

diff --git a/pal_mix.h b/pal_mix.h
deleted file mode 100644 (file)
index 0c312e9..0000000
--- a/pal_mix.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-pal_mix.h
-The tool to hide two indexed images iside one
-30.11.2022
-
-Copyright (C) 2022  Balthasar Szczepański
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-Requires Dev Image Library (libdevil) (http://openil.sourceforge.net/)
-on Pentium III libdevil must be recompiled with
---disable-ssl2 --disable-ssl3
-(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572954)
-*/
-
-int subtool_pal_mix (int argc, char **argv, int argi, char **err);

diff --git a/extract.c b/pal_unmix.c
similarity index 100%
rename from extract.c
rename to pal_unmix.c

diff --git a/reveal.h b/reveal.h
deleted file mode 100644 (file)
index 45672c4..0000000
--- a/reveal.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-reveal.h
-reveal hidden details
-13.11.2022
-
-Copyright (C) 2022  Balthasar Szczepański
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-Requires Dev Image Library (libdevil) (http://openil.sourceforge.net/)
-on Pentium III libdevil must be recompiled with
---disable-ssl2 --disable-ssl3
-(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572954)
-*/
-
-int subtool_reveal (int argc, char **argv, int argi, char **err);

diff --git a/settings-standalone.txt b/settings-subtool.txt
similarity index 84%
rename from settings-standalone.txt
rename to settings-subtool.txt
index c59f11d7eaeec7624c80ff08722463dd26714b49..7f11896cdcd79a49a9c0c60643920b88e6e01424 100644 (file)
--- a/settings-standalone.txt
+++ b/settings-subtool.txt
@@ -1,5 +1,5 @@
-# settings-standalone.txt
-# 12.11.2022
+# settings-subtool.txt
+# 01.12.2022
 # 
 # Copyright (C) 2022  Balthasar Szczepański
 # 
@@ -20,5 +20,5 @@ _C_DEFINE: #define $0 $1
 _C_DEFINE_STR: #define $0 "@_ESCAPE($1)"
 _C_INCLUDE_STR: #include "@_ESCAPE($0)"
 
-C_STANDALONE_INCLUDE = @_C_INCLUDE_STR($subtool\.h)
-C_STANDALONE_SUBTOOL = @_C_DEFINE(SUBTOOL, subtool_$subtool)
+C_INCLUDE = @_C_INCLUDE_STR($subtool\.h)
+C_SUBTOOL = @_C_DEFINE(SUBTOOL, subtool_$subtool)

diff --git a/standalone.c b/standalone.c
index f5cc8e3c00e143c4b51a4c4605cedc2b337ea627..379374616a2f6311bf0a939942ec190961432237 100644 (file)
--- a/standalone.c
+++ b/standalone.c
@@ -1,7 +1,7 @@
 /*
 standalone.c
 general main wrapper for the subtools
-12.11.2022
+01.12.2022
 
 Copyright (C) 2022  Balthasar Szczepański
 
@@ -21,9 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "core.h"
-// ###C_STANDALONE_INCLUDE: #include "TOOL_NAME.h"
+// ###C_INCLUDE: #include "TOOL_NAME.h"
 
-// ###C_STANDALONE_SUBTOOL: #define SUBTOOL "subtool_TOOL_NAME"
+// ###C_SUBTOOL: #define SUBTOOL subtool_TOOL_NAME
 
 int main (int argc, char **argv)
 {

diff --git a/bluenh.h b/subtool.h
similarity index 83%
rename from bluenh.h
rename to subtool.h
index 0925ab9d52b7e316ba8518ddf8c17368df81b643..60ef8da7f471c9d801a34aea6ff56ac0a0b648b8 100644 (file)
--- a/bluenh.h
+++ b/subtool.h
@@ -1,7 +1,7 @@
 /*
-bluenh.h
-ENHANCE the bluepix!
-13.11.2022
+subtool.h
+general header for subtools
+01.12.2022
 
 Copyright (C) 2022  Balthasar Szczepański
 
@@ -25,4 +25,6 @@ on Pentium III libdevil must be recompiled with
 (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572954)
 */
 
-int subtool_bluenh (int argc, char **argv, int argi, char **err);
+// ###C_SUBTOOL: #define SUBTOOL subtool_TOOL_NAME 
+int SUBTOOL (int argc, char **argv, int argi, char **err);
+#undef SUBTOOL