[narnaoud] 12807: Use build helpers from /reactos/tools/

Use build helpers from /reactos/tools/
Modified: trunk/rosapps/sysutils/regexpl/Makefile
Modified: trunk/rosapps/sysutils/regexpl/SecurityDescriptor.cpp
Modified: trunk/rosapps/sysutils/regexpl/ph.h
  _____

Modified: trunk/rosapps/sysutils/regexpl/Makefile
--- trunk/rosapps/sysutils/regexpl/Makefile	2005-01-04 22:44:50 UTC
(rev 12806)
+++ trunk/rosapps/sysutils/regexpl/Makefile	2005-01-04 23:36:14 UTC
(rev 12807)
@@ -5,22 +5,13 @@

PATH_TO_TOP := ../../../reactos

-include $(PATH_TO_TOP)/rules.mak
+TARGET_TYPE = program

-TARGET_NAME=regexpl
+TARGET_APPTYPE = console

-all: $(TARGET_NAME).exe
+TARGET_NAME = regexpl

-ROS_DIR=../../../reactos
-ROS_INC=$(ROS_DIR)/include
-ROS_LIB=$(ROS_DIR)/dk/w32/lib
-IMPORT_NTDLL=$(ROS_LIB)/libntdll.a
-IMPORT_FMIFS=$(ROS_LIB)/libfmifs.a
-IMPORT_KERNEL32=$(ROS_LIB)/libkernel32.a
-IMPORT_ADVAPI32=$(ROS_LIB)/libadvapi32.a
-IMPORT_USER32=$(ROS_LIB)/libuser32.a
-
-OBJECTS = \
+TARGET_OBJECTS = 			\
    ArgumentParser.o		\
    Console.o			\
    RegistryExplorer.o		\
@@ -43,48 +34,25 @@
    ShellCommandValue.o		\
    ShellCommandVersion.o		\
    ShellCommandsLinkedList.o	\
-	CrtSupplement.c			\
+	CrtSupplement.o			\
    TextHistory.o			\
    Completion.o			\
    Pattern.o			\
    Settings.o			\
    Prompt.o

-CLEAN_FILES = \
-	*.o				\
-	$(TARGET_NAME).exe		\
-	$(TARGET_NAME).sym		
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE -I./

-$(TARGET_NAME).exe: $(OBJECTS)
-	$(CXX) -Wl,--subsystem,console -o $(TARGET_NAME).exe
$(OBJECTS)$(IMPORT_KERNEL32) $(IMPORT_USER32)
-	$(NM) --numeric-sort $(TARGET_NAME).exe > $(TARGET_NAME).sym
+include $(PATH_TO_TOP)/rules.mak

-clean: $(CLEAN_FILES:%=%_clean)
+include $(TOOLS_PATH)/helper.mk

-$(CLEAN_FILES:%=%_clean): %_clean:
-	- $(RM) $*
+# C++ code should be linked with c++ aware linker (g++)
+LD_CC = $(CXX)

-.phony: clean $(CLEAN_FILES:%=%_clean)
+# Automatic dependency tracking
+DEP_OBJECTS := $(TARGET_OBJECTS)

+include $(PATH_TO_TOP)/tools/depend.mk

-floppy: $(TARGET:%=$(FLOPPY_DIR)/apps/%)
-
-$(TARGET:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps$*
-else
-	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif
-
-
-dist: $(TARGET:%=../$(DIST_DIR)/apps/%)
-
-$(TARGET:%=../$(DIST_DIR)/apps/%): ../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..$(DIST_DIR)\apps$*
-else
-	$(CP) $* ../$(DIST_DIR)/apps$*
-endif
-
-
 # EOF
  _____

Modified: trunk/rosapps/sysutils/regexpl/SecurityDescriptor.cpp
--- trunk/rosapps/sysutils/regexpl/SecurityDescriptor.cpp
2005-01-04 22:44:50 UTC (rev 12806)
+++ trunk/rosapps/sysutils/regexpl/SecurityDescriptor.cpp
2005-01-04 23:36:14 UTC (rev 12807)
@@ -24,13 +24,9 @@

//
 //////////////////////////////////////////////////////////////////////

-#include <windows.h>
-#include <assert.h>
-#include <tchar.h>
+#include "ph.h"
 #include "SecurityDescriptor.h"

-#define ASSERT assert
-
 // *** THIS SHOULD GO IN A MINGW/ROS HEADER - Begin
 #if 1

_____

Modified: trunk/rosapps/sysutils/regexpl/ph.h
--- trunk/rosapps/sysutils/regexpl/ph.h	2005-01-04 22:44:50 UTC (rev
12806)
+++ trunk/rosapps/sysutils/regexpl/ph.h	2005-01-04 23:36:14 UTC (rev
12807)
@@ -1,4 +1,4 @@

-/* $Id: ph.h,v 1.5 2004/10/11 01:24:22 sedwards Exp $ */
+/* $Id$ */

// ph.h : include file for standard system include files,
 //  or project specific include files that are used frequently, but
@@ -18,24 +18,29 @@
 #define _DEBUG
 #endif

-#include <tchar.h>
+#include <stdarg.h>

-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
+#include <windef.h>
+#include <wincon.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winreg.h>
+
 #include <assert.h>
-#include <ctype.h>
-#include <tchar.h>
 #define ASSERT	assert
 #ifdef _DEBUG
 #define VERIFY ASSERT
 #else
 #define VERIFY(e)	(e)
 #endif
-#include <windows.h>
-#include <wincon.h>
+
 #include <conio.h>
 #include <limits.h>
+#include <tchar.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>

// INHERITED_ACE is from windows 2000
 #ifndef INHERITED_ACE