From ee08f03b99590a0e0eef08f2aed04c0e4b7b9f53 Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Mon, 11 Oct 2004 01:20:13 +0000 Subject: [PATCH] Make regexpl build again. This has been bitrotting for a while. svn path=/trunk/; revision=11267 --- rosapps/sysutils/regexpl/Makefile | 32 ++++++------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/rosapps/sysutils/regexpl/Makefile b/rosapps/sysutils/regexpl/Makefile index 8ad5aa9bc72..ca8605b7233 100644 --- a/rosapps/sysutils/regexpl/Makefile +++ b/rosapps/sysutils/regexpl/Makefile @@ -1,9 +1,9 @@ -# $Id: Makefile,v 1.11 2003/10/19 22:59:36 narnaoud Exp $ +# $Id: Makefile,v 1.12 2004/10/11 01:20:13 sedwards Exp $ # # ReactOS makefile for RegExpl # -PATH_TO_TOP = ../.. +PATH_TO_TOP := ../../../reactos include $(PATH_TO_TOP)/rules.mak @@ -11,8 +11,6 @@ TARGET_NAME=regexpl all: $(TARGET_NAME)$(EXE_POSTFIX) -include depend.mak - ROS_DIR=../../../reactos ROS_INC=$(ROS_DIR)/include ROS_LIB=$(ROS_DIR)/dk/w32/lib @@ -22,10 +20,6 @@ IMPORT_KERNEL32=$(ROS_LIB)/kernel32.a IMPORT_ADVAPI32=$(ROS_LIB)/advapi32.a IMPORT_USER32=$(ROS_LIB)/user32.a -depend.mak : *.h - $(CC) \ - -MM *.cpp *.c > $@ - OBJECTS = \ ArgumentParser.o \ Console.o \ @@ -54,31 +48,17 @@ OBJECTS = \ Completion.o \ Pattern.o \ Settings.o \ - Prompt.o \ - $(TARGET_NAME).coff + Prompt.o CLEAN_FILES = \ *.o \ $(TARGET_NAME)$(EXE_POSTFIX) \ - $(TARGET_NAME).sym \ - $(TARGET_NAME).coff\ - depend.mak + $(TARGET_NAME).sym - -$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS) $(TARGET_NAME).coff - $(CXX) -Wl,--subsystem,console -o $(TARGET_NAME)$(EXE_POSTFIX) $(OBJECTS) $(TARGET_NAME).coff $(IMPORT_KERNEL32) $(IMPORT_USER32) +$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS) + $(CXX) -Wl,--subsystem,console -o $(TARGET_NAME)$(EXE_POSTFIX) $(OBJECTS)$(IMPORT_KERNEL32) $(IMPORT_USER32) $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym - -#$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS) -# $(CPP) \ -# -Wl,--subsystem,console \ -# -o $@ \ -# $(IMPORT_KERNEL32) \ -# $(IMPORT_USER32) \ -# $(OBJECTS) -# $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym - clean: $(CLEAN_FILES:%=%_clean) $(CLEAN_FILES:%=%_clean): %_clean: