diff --git a/Makefile b/Makefile index 8c4ef394..1743fb1c 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,7 @@ endif .PHONY : all debug release clean depend zip version force install uninstall # This is the list of the objects we want to build. Dependancies are built by "make depend" automatically. -OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o $(OBJDIR)/divers.o $(OBJDIR)/special.o $(OBJDIR)/boutons.o $(OBJDIR)/palette.o $(OBJDIR)/aide.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/moteur.o $(OBJDIR)/files.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/clavier.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/texte.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o +OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o $(OBJDIR)/misc.o $(OBJDIR)/special.o $(OBJDIR)/buttons.o $(OBJDIR)/palette.o $(OBJDIR)/help.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/engine.o $(OBJDIR)/filesel.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/keyboard.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/text.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o all : $(BIN) diff --git a/Makefile.dep b/Makefile.dep index 7b4dcdb5..c787662e 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -1,66 +1,64 @@ -$(OBJDIR)/aide.o: aide.c const.h struct.h global.h divers.h moteur.h tables_aide.h \ - aide.h sdlscreen.h texte.h clavier.h windows.h input.h hotkeys.h \ - erreurs.h -$(OBJDIR)/boutons.o: boutons.c const.h struct.h global.h divers.h graph.h moteur.h \ - readline.h files.h loadsave.h init.h boutons.h operatio.h pages.h \ - erreurs.h readini.h saveini.h shade.h io.h aide.h texte.h sdlscreen.h \ - windows.h brush.h input.h -$(OBJDIR)/brush.o: brush.c global.h struct.h const.h graph.h divers.h erreurs.h \ +$(OBJDIR)/SFont.o: SFont.c SFont.h +$(OBJDIR)/brush.o: brush.c global.h struct.h const.h graph.h misc.h errors.h \ windows.h sdlscreen.h -$(OBJDIR)/clavier.o: clavier.c global.h struct.h const.h -$(OBJDIR)/divers.o: divers.c struct.h const.h sdlscreen.h global.h erreurs.h \ - boutons.h moteur.h divers.h clavier.h windows.h palette.h input.h -$(OBJDIR)/files.o: files.c const.h struct.h global.h divers.h erreurs.h io.h \ - windows.h loadsave.h mountlist.h moteur.h -$(OBJDIR)/graph.o: graph.c global.h struct.h const.h moteur.h boutons.h pages.h \ - erreurs.h sdlscreen.h graph.h divers.h pxsimple.h pxtall.h pxwide.h \ +$(OBJDIR)/buttons.o: buttons.c const.h struct.h global.h misc.h graph.h engine.h \ + readline.h filesel.h loadsave.h init.h buttons.h operatio.h pages.h \ + errors.h readini.h saveini.h shade.h io.h help.h text.h sdlscreen.h \ + windows.h brush.h input.h +$(OBJDIR)/engine.o: engine.c const.h struct.h global.h graph.h misc.h special.h \ + buttons.h operatio.h shade.h errors.h sdlscreen.h windows.h brush.h \ + input.h engine.h +$(OBJDIR)/filesel.o: filesel.c const.h struct.h global.h misc.h errors.h io.h \ + windows.h sdlscreen.h loadsave.h mountlist.h engine.h readline.h \ + input.h help.h +$(OBJDIR)/graph.o: graph.c global.h struct.h const.h engine.h buttons.h pages.h \ + errors.h sdlscreen.h graph.h misc.h pxsimple.h pxtall.h pxwide.h \ pxdouble.h windows.h +$(OBJDIR)/help.o: help.c const.h struct.h global.h misc.h engine.h helpfile.h \ + help.h sdlscreen.h text.h keyboard.h windows.h input.h hotkeys.h \ + errors.h $(OBJDIR)/hotkeys.o: hotkeys.c struct.h const.h global.h hotkeys.h -$(OBJDIR)/init.o: init.c const.h struct.h global.h graph.h boutons.h palette.h \ - aide.h operatio.h divers.h erreurs.h clavier.h io.h hotkeys.h files.h \ - setup.h windows.h sdlscreen.h mountlist.h loadsave.h -$(OBJDIR)/input.o: input.c global.h struct.h const.h clavier.h sdlscreen.h \ - windows.h erreurs.h divers.h input.h +$(OBJDIR)/init.o: init.c const.h struct.h global.h graph.h buttons.h palette.h \ + help.h operatio.h misc.h errors.h keyboard.h io.h hotkeys.h setup.h \ + windows.h sdlscreen.h mountlist.h loadsave.h +$(OBJDIR)/input.o: input.c global.h struct.h const.h keyboard.h sdlscreen.h \ + windows.h errors.h misc.h input.h $(OBJDIR)/io.o: io.c struct.h const.h io.h -$(OBJDIR)/loadsave.o: loadsave.c const.h struct.h global.h divers.h pages.h op_c.h \ - boutons.h erreurs.h io.h sdlscreen.h windows.h loadsave.h -$(OBJDIR)/main.o: main.c const.h struct.h global.h graph.h divers.h init.h \ - boutons.h moteur.h pages.h files.h loadsave.h sdlscreen.h erreurs.h \ - readini.h saveini.h io.h texte.h setup.h windows.h brush.h palette.h -$(OBJDIR)/moteur.o: moteur.c const.h struct.h global.h graph.h divers.h special.h \ - boutons.h operatio.h shade.h erreurs.h sdlscreen.h windows.h brush.h \ - input.h moteur.h -$(OBJDIR)/mountlist.o: mountlist.c mountlist.h -$(OBJDIR)/op_c.o: op_c.c op_c.h struct.h const.h erreurs.h -$(OBJDIR)/operatio.o: operatio.c const.h struct.h global.h divers.h moteur.h \ - graph.h operatio.h boutons.h pages.h erreurs.h sdlscreen.h brush.h \ +$(OBJDIR)/keyboard.o: keyboard.c global.h struct.h const.h +$(OBJDIR)/loadsave.o: loadsave.c const.h struct.h global.h misc.h pages.h op_c.h \ + buttons.h errors.h io.h sdlscreen.h windows.h loadsave.h +$(OBJDIR)/main.o: main.c const.h struct.h global.h graph.h misc.h init.h buttons.h \ + engine.h pages.h loadsave.h sdlscreen.h errors.h readini.h saveini.h \ + io.h text.h setup.h windows.h brush.h palette.h +$(OBJDIR)/misc.o: misc.c struct.h const.h sdlscreen.h global.h errors.h buttons.h \ + engine.h misc.h keyboard.h windows.h palette.h input.h +$(OBJDIR)/mountlist.o: mountlist.c +$(OBJDIR)/op_c.o: op_c.c op_c.h struct.h const.h errors.h +$(OBJDIR)/operatio.o: operatio.c const.h struct.h global.h misc.h engine.h graph.h \ + operatio.h buttons.h pages.h errors.h sdlscreen.h brush.h windows.h +$(OBJDIR)/pages.o: pages.c global.h struct.h const.h pages.h errors.h misc.h \ windows.h -$(OBJDIR)/pages.o: pages.c global.h struct.h const.h pages.h erreurs.h divers.h \ - windows.h -$(OBJDIR)/palette.o: palette.c const.h struct.h global.h divers.h moteur.h \ - readline.h boutons.h pages.h aide.h sdlscreen.h erreurs.h op_c.h \ - windows.h input.h -$(OBJDIR)/pxdouble.o: pxdouble.c global.h struct.h const.h sdlscreen.h divers.h \ +$(OBJDIR)/palette.o: palette.c const.h struct.h global.h misc.h engine.h readline.h \ + buttons.h pages.h help.h sdlscreen.h errors.h op_c.h windows.h input.h +$(OBJDIR)/pxdouble.o: pxdouble.c global.h struct.h const.h sdlscreen.h misc.h \ pxwide.h -$(OBJDIR)/pxsimple.o: pxsimple.c global.h struct.h const.h sdlscreen.h divers.h -$(OBJDIR)/pxtall.o: pxtall.c global.h struct.h const.h sdlscreen.h divers.h \ +$(OBJDIR)/pxsimple.o: pxsimple.c global.h struct.h const.h sdlscreen.h misc.h +$(OBJDIR)/pxtall.o: pxtall.c global.h struct.h const.h sdlscreen.h misc.h \ pxsimple.h -$(OBJDIR)/pxwide.o: pxwide.c global.h struct.h const.h sdlscreen.h divers.h -$(OBJDIR)/readini.o: readini.c const.h global.h struct.h divers.h -$(OBJDIR)/readline.o: readline.c const.h struct.h global.h divers.h erreurs.h \ +$(OBJDIR)/pxwide.o: pxwide.c global.h struct.h const.h sdlscreen.h misc.h +$(OBJDIR)/readini.o: readini.c const.h global.h struct.h misc.h +$(OBJDIR)/readline.o: readline.c const.h struct.h global.h misc.h errors.h \ sdlscreen.h readline.h windows.h input.h $(OBJDIR)/realpath.o: realpath.c -$(OBJDIR)/saveini.o: saveini.c const.h global.h struct.h readini.h io.h erreurs.h \ - divers.h -$(OBJDIR)/sdlscreen.o: sdlscreen.c global.h struct.h const.h sdlscreen.h erreurs.h \ - divers.h -$(OBJDIR)/setup.o: setup.c struct.h const.h io.h files.h -$(OBJDIR)/SFont.o: SFont.c SFont.h -$(OBJDIR)/shade.o: shade.c global.h struct.h const.h graph.h moteur.h divers.h \ - readline.h aide.h sdlscreen.h windows.h input.h -$(OBJDIR)/special.o: special.c const.h struct.h global.h graph.h moteur.h windows.h -$(OBJDIR)/texte.o: texte.c SFont.h struct.h const.h global.h sdlscreen.h io.h \ - files.h +$(OBJDIR)/saveini.o: saveini.c const.h global.h struct.h readini.h io.h errors.h \ + misc.h +$(OBJDIR)/sdlscreen.o: sdlscreen.c global.h struct.h const.h sdlscreen.h errors.h \ + misc.h +$(OBJDIR)/setup.o: setup.c struct.h const.h io.h +$(OBJDIR)/shade.o: shade.c global.h struct.h const.h graph.h engine.h misc.h \ + readline.h help.h sdlscreen.h windows.h input.h +$(OBJDIR)/special.o: special.c const.h struct.h global.h graph.h engine.h windows.h +$(OBJDIR)/text.o: text.c SFont.h struct.h const.h global.h sdlscreen.h io.h $(OBJDIR)/version.o: version.c -$(OBJDIR)/windows.o: windows.c windows.h struct.h const.h global.h graph.h moteur.h \ - divers.h sdlscreen.h erreurs.h +$(OBJDIR)/windows.o: windows.c windows.h struct.h const.h global.h graph.h engine.h \ + misc.h sdlscreen.h errors.h diff --git a/brush.c b/brush.c index 9efb7a6b..b36c4f92 100644 --- a/brush.c +++ b/brush.c @@ -30,8 +30,8 @@ #include "global.h" #include "graph.h" -#include "divers.h" -#include "erreurs.h" +#include "misc.h" +#include "errors.h" #include "windows.h" #include "sdlscreen.h" diff --git a/boutons.c b/buttons.c similarity index 99% rename from boutons.c rename to buttons.c index 3521e6d7..7a3422d3 100644 --- a/boutons.c +++ b/buttons.c @@ -30,23 +30,23 @@ #include "const.h" #include "struct.h" #include "global.h" -#include "divers.h" +#include "misc.h" #include "graph.h" -#include "moteur.h" +#include "engine.h" #include "readline.h" -#include "files.h" +#include "filesel.h" #include "loadsave.h" #include "init.h" -#include "boutons.h" +#include "buttons.h" #include "operatio.h" #include "pages.h" -#include "erreurs.h" +#include "errors.h" #include "readini.h" #include "saveini.h" #include "shade.h" #include "io.h" -#include "aide.h" -#include "texte.h" +#include "help.h" +#include "text.h" #include "sdlscreen.h" #include "windows.h" #include "brush.h" diff --git a/boutons.h b/buttons.h similarity index 100% rename from boutons.h rename to buttons.h diff --git a/doc/Le moteur des operations.html b/doc/Le moteur des operations.html index 95b43913..42c5bdd4 100644 --- a/doc/Le moteur des operations.html +++ b/doc/Le moteur des operations.html @@ -1,7 +1,7 @@ -
-@@ -320,65 +320,65 @@ s'achever! ;-) - - - + + + diff --git a/moteur.c b/engine.c similarity index 99% rename from moteur.c rename to engine.c index 9bd9e03f..241fb5b5 100644 --- a/moteur.c +++ b/engine.c @@ -29,17 +29,17 @@ #include "struct.h" #include "global.h" #include "graph.h" -#include "divers.h" +#include "misc.h" #include "special.h" -#include "boutons.h" +#include "buttons.h" #include "operatio.h" #include "shade.h" -#include "erreurs.h" +#include "errors.h" #include "sdlscreen.h" #include "windows.h" #include "brush.h" #include "input.h" -#include "moteur.h" +#include "engine.h" // we need this as global diff --git a/moteur.h b/engine.h similarity index 100% rename from moteur.h rename to engine.h diff --git a/erreurs.h b/errors.h similarity index 100% rename from erreurs.h rename to errors.h diff --git a/files.c b/filesel.c similarity index 99% rename from files.c rename to filesel.c index 1252e1ad..d13a1899 100644 --- a/files.c +++ b/filesel.c @@ -45,17 +45,17 @@ #include "const.h" #include "struct.h" #include "global.h" -#include "divers.h" -#include "erreurs.h" +#include "misc.h" +#include "errors.h" #include "io.h" #include "windows.h" #include "sdlscreen.h" #include "loadsave.h" #include "mountlist.h" -#include "moteur.h" +#include "engine.h" #include "readline.h" #include "input.h" -#include "aide.h" +#include "help.h" #define NORMAL_FILE_COLOR MC_Light // color du texte pour une ligne de fichier non sélectionné #define NORMAL_DIRECTORY_COLOR MC_Dark // color du texte pour une ligne de répertoire non sélectionné diff --git a/files.h b/filesel.h similarity index 100% rename from files.h rename to filesel.h diff --git a/graph.c b/graph.c index 140a254b..98a7b012 100644 --- a/graph.c +++ b/graph.c @@ -31,13 +31,13 @@ #include "global.h" #include "struct.h" -#include "moteur.h" -#include "boutons.h" +#include "engine.h" +#include "buttons.h" #include "pages.h" -#include "erreurs.h" +#include "errors.h" #include "sdlscreen.h" #include "graph.h" -#include "divers.h" +#include "misc.h" #include "pxsimple.h" #include "pxtall.h" #include "pxwide.h" diff --git a/aide.c b/help.c similarity index 99% rename from aide.c rename to help.c index 61553c68..3ab9c393 100644 --- a/aide.c +++ b/help.c @@ -36,17 +36,17 @@ #include "const.h" #include "struct.h" #include "global.h" -#include "divers.h" -#include "moteur.h" -#include "tables_aide.h" -#include "aide.h" +#include "misc.h" +#include "engine.h" +#include "helpfile.h" +#include "help.h" #include "sdlscreen.h" -#include "texte.h" -#include "clavier.h" +#include "text.h" +#include "keyboard.h" #include "windows.h" #include "input.h" #include "hotkeys.h" -#include "erreurs.h" +#include "errors.h" extern char SVN_revision[]; // generated in version.c diff --git a/aide.h b/help.h similarity index 100% rename from aide.h rename to help.h diff --git a/tables_aide.h b/helpfile.h similarity index 100% rename from tables_aide.h rename to helpfile.h diff --git a/init.c b/init.c index 050da262..8fc377ac 100644 --- a/init.c +++ b/init.c @@ -51,13 +51,13 @@ #include "struct.h" #include "global.h" #include "graph.h" -#include "boutons.h" +#include "buttons.h" #include "palette.h" -#include "aide.h" +#include "help.h" #include "operatio.h" -#include "divers.h" -#include "erreurs.h" -#include "clavier.h" +#include "misc.h" +#include "errors.h" +#include "keyboard.h" #include "io.h" #include "hotkeys.h" #include "setup.h" diff --git a/input.c b/input.c index f602c3ef..1e511bab 100644 --- a/input.c +++ b/input.c @@ -22,11 +22,11 @@ #include-Initialiser_operation(OPERATION_DUMMY, 1, 0, +
Init_operation(OPERATION_DUMMY, 1, 0, Dummy_1_0, 1);