From 5b827d7354199cd70dd1c49e8b3867afaae1bad6 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Mon, 10 Nov 2003 19:29:24 +0000 Subject: [PATCH] use rdel instead of rm in Explorer Makefile svn path=/trunk/; revision=6606 --- reactos/subsys/system/explorer/Makefile | 4 +++- reactos/tools/rdel.c | 8 ++++---- reactos/tools/rrmdir.c | 8 ++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/reactos/subsys/system/explorer/Makefile b/reactos/subsys/system/explorer/Makefile index 450ae13eb02..987f4568fc3 100644 --- a/reactos/subsys/system/explorer/Makefile +++ b/reactos/subsys/system/explorer/Makefile @@ -8,6 +8,8 @@ CC = gcc CXX = g++ LINK = g++ +TOOLS_PATH = ../../../tools + CFLAGS = -DWIN32 -D_ROS_ -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall RCFLAGS = -DWIN32 -D_ROS_ LFLAGS = -Wl,--subsystem,windows @@ -91,5 +93,5 @@ explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc windres $(RCFLAGS) -o $@ $^ clean: - rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) + $(TOOLS_PATH)/rdel $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) diff --git a/reactos/tools/rdel.c b/reactos/tools/rdel.c index d98fd96cf86..0753ef88f00 100644 --- a/reactos/tools/rdel.c +++ b/reactos/tools/rdel.c @@ -1,7 +1,7 @@ -/* $Id: rdel.c,v 1.1 2001/08/21 20:13:17 chorns Exp $ +/* $Id: rdel.c,v 1.2 2003/11/10 19:29:24 mf Exp $ * COPYRIGHT: See COPYING in the top level directory * PROGRAMMER: Rex Jolliff (rex@lvcablemodem.com) - * PURPOSE: Platform independant delete command + * PURPOSE: Platform independent delete command */ #include @@ -24,6 +24,7 @@ convertPath (char * pathToConvert) } } +#if 0 void getDirectory (const char *filename, char * directorySpec) { @@ -40,6 +41,7 @@ getDirectory (const char *filename, char * directorySpec) strcpy (directorySpec, "."); } } +#endif void getFilename (const char *filename, char * fileSpec) @@ -87,5 +89,3 @@ main (int argc, char* argv[]) return 0; } - - diff --git a/reactos/tools/rrmdir.c b/reactos/tools/rrmdir.c index 7b4e6a7b3d4..eddf64417a4 100644 --- a/reactos/tools/rrmdir.c +++ b/reactos/tools/rrmdir.c @@ -1,8 +1,8 @@ -/* $Id: rrmdir.c,v 1.1 2001/08/21 20:13:17 chorns Exp $ +/* $Id: rrmdir.c,v 1.2 2003/11/10 19:29:24 mf Exp $ * COPYRIGHT: See COPYING in the top level directory * PROGRAMMER: Rex Jolliff (rex@lvcablemodem.com) * Casper S. Hornstrup (chorns@users.sourceforge.net) - * PURPOSE: Platform independant remove directory command + * PURPOSE: Platform independent remove directory command */ #include @@ -25,6 +25,7 @@ convertPath (char * pathToConvert) } } +#if 0 void getDirectory (const char *filename, char * directorySpec) { @@ -54,6 +55,7 @@ getFilename (const char *filename, char * fileSpec) strcpy (fileSpec, filename); } } +#endif int main (int argc, char* argv[]) @@ -88,5 +90,3 @@ main (int argc, char* argv[]) return 0; } - -