From 3032eefcc42b3aaf2999e64f620fbf2e20c17c31 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sun, 20 Jul 2003 22:55:39 +0000
Subject: [PATCH] - Changed volinfo from a windows to a console program.

svn path=/trunk/; revision=5194
---
 reactos/apps/tests/Makefile                |  2 +-
 reactos/apps/tests/tests/volinfo/Makefile  | 34 ++++++----------------
 reactos/apps/tests/tests/volinfo/volinfo.c |  3 +-
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/reactos/apps/tests/Makefile b/reactos/apps/tests/Makefile
index 34a53192bad..068451761a6 100644
--- a/reactos/apps/tests/Makefile
+++ b/reactos/apps/tests/Makefile
@@ -10,7 +10,7 @@ TEST_APPS = alive apc args atomtest bench bitblt button button2 \
 combo consume copymove count dump_shared_data edit event file \
 gditest hello isotest lineclip lpc messagebox mstest mutex nptest pteb \
 regtest sectest shm thread tokentest vmtest winhello dibtest lock \
-hivetest shaptest wm_paint multiwin icontest suspend
+hivetest shaptest wm_paint multiwin icontest suspend tests/volinfo
 
 TEST_MISC = 
 
diff --git a/reactos/apps/tests/tests/volinfo/Makefile b/reactos/apps/tests/tests/volinfo/Makefile
index 3a37271b920..8842a1c1ead 100644
--- a/reactos/apps/tests/tests/volinfo/Makefile
+++ b/reactos/apps/tests/tests/volinfo/Makefile
@@ -3,34 +3,18 @@
 #
 PATH_TO_TOP = ../../../..
 
-PROGS = volinfo
+TARGET_NORC = yes
 
-OBJECTS = volinfo.o
+TARGET_TYPE = program
 
-LIBS =
-CFLAGS =
+TARGET_APPTYPE = console
 
-all: $(PROGS:%=%.exe)
+TARGET_NAME = volinfo
 
-.phony: all
-
-clean:
-	- $(RM) *.o  *.exe *.sym
-
-.phony: clean
-
-install: $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)
-
-$(PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
-	$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
-
-dist: $(PROGS:%=../../$(DIST_DIR)/apps/%.exe)
-
-$(PROGS:%=../../$(DIST_DIR)/apps/%.exe): ../../$(DIST_DIR)/apps/%.exe: %.exe
-	$(CP) $*.exe ../../$(DIST_DIR)/apps/$*.exe
-
-volinfo.exe: $(OBJECTS)
-	$(CC) $(CFLAGS) -Wl,--subsystem,windows $(OBJECTS) $(LIBS) -o volinfo.exe
-	$(NM) --numeric-sort volinfo.exe > volinfo.sym
+TARGET_OBJECTS = $(TARGET_NAME).o
 
 include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF
diff --git a/reactos/apps/tests/tests/volinfo/volinfo.c b/reactos/apps/tests/tests/volinfo/volinfo.c
index bc639d1fdd5..bc99044035a 100644
--- a/reactos/apps/tests/tests/volinfo/volinfo.c
+++ b/reactos/apps/tests/tests/volinfo/volinfo.c
@@ -5,8 +5,7 @@
 #include <stdio.h>
 #include <string.h> /* for strcat() */
 
-int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
-                   LPSTR lpszCmdLine, int nCmdShow)
+int main(void)
 {
     char  drive, root[]="C:\\", label[1002], fsname[1002];
     DWORD serial, flags, filenamelen, labellen = 1000, fsnamelen = 1000;