Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

2004-07-21 Casper S. Hornstrup <chorns@users.sourceforge.net>

Browse source 
* rules.mak, iface/addsys/makefile, iface/native/makefile,
	tools/Makefile: Be quiet if VERBOSE=no.
	* tools/helper.mk: Print module name if it was successfully built.
	* tools/regtests.c, tools/wine2ros/wine2ros.c: Be quiet.

svn path=/trunk/; revision=10239
This commit is contained in:
Casper Hornstrup 2004-07-21 18:17:50 +00:00
parent 0b9e69fecf
commit 4175709d6c
8 changed files with 73 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/ChangeLog
View file

@ -1,3 +1,10 @@
2004-07-21 Casper S. Hornstrup <chorns@users.sourceforge.net>
* rules.mak, iface/addsys/makefile, iface/native/makefile,
tools/Makefile: Be quiet if VERBOSE=no.
* tools/helper.mk: Print module name if it was successfully built.
* tools/regtests.c, tools/wine2ros/wine2ros.c: Be quiet.
2004-06-05 Casper S. Hornstrup <chorns@users.sourceforge.net> 2004-06-05 Casper S. Hornstrup <chorns@users.sourceforge.net>
* tools/helper.mk: Skip automatic dependency tracking if * tools/helper.mk: Skip automatic dependency tracking if

4
reactos/iface/addsys/makefile
View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.13 2003/12/03 21:50:49 gvg Exp $ # $Id: makefile,v 1.14 2004/07/21 18:17:50 chorns Exp $
# #
# ReactOS Operating System # ReactOS Operating System
# #
@ -36,7 +36,7 @@ $(TARGETNAME)$(EXE_POSTFIX): $(TARGETNAME).c
$(TARGETNAME).c $(TARGETNAME).c
$(SVC_FILES): $(SVC_DB) $(TARGETNAME)$(EXE_POSTFIX) $(SVC_FILES): $(SVC_DB) $(TARGETNAME)$(EXE_POSTFIX)
./$(TARGETNAME)$(EXE_POSTFIX) \ @./$(TARGETNAME)$(EXE_POSTFIX) \
$(SVC_DB) \ $(SVC_DB) \
$(SVC_SERVICE_TABLE) \ $(SVC_SERVICE_TABLE) \
$(SVC_GDI_STUBS) \ $(SVC_GDI_STUBS) \

4
reactos/iface/native/makefile
View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.13 2003/11/14 17:13:30 weiden Exp $ # $Id: makefile,v 1.14 2004/07/21 18:17:50 chorns Exp $
# #
# ReactOS Operating System # ReactOS Operating System
# #
@ -22,7 +22,7 @@ BASE_CFLAGS = -I../../include
all: $(TARGET)$(EXE_POSTFIX) $(NAPI_FILES) all: $(TARGET)$(EXE_POSTFIX) $(NAPI_FILES)
$(NAPI_FILES): $(SYSTEM_CALLS_DB) $(TARGET)$(EXE_POSTFIX) $(NAPI_FILES): $(SYSTEM_CALLS_DB) $(TARGET)$(EXE_POSTFIX)
./$(TARGET)$(EXE_POSTFIX) \ @./$(TARGET)$(EXE_POSTFIX) \
$(SYSTEM_CALLS_DB) \ $(SYSTEM_CALLS_DB) \
$(NTDLL_STUBS) \ $(NTDLL_STUBS) \
$(KERNEL_SERVICE_TABLE) \ $(KERNEL_SERVICE_TABLE) \

79
reactos/rules.mak
View file

@ -3,6 +3,18 @@
# #
.EXPORT_ALL_VARIABLES: .EXPORT_ALL_VARIABLES:
# Default to verbose mode
ifeq ($(VERBOSE),no)
Q = @
else
Q =
endif
MAKE := @$(MAKE)
# Do not print "Entering directory ..."
MAKEFLAGS += --no-print-directory
# Windows is default host environment # Windows is default host environment
ifeq ($(HOST),) ifeq ($(HOST),)
HOST = mingw32-windows HOST = mingw32-windows
@ -44,12 +56,12 @@ NASM_FORMAT = win32
PREFIX = PREFIX =
EXE_PREFIX := EXE_PREFIX :=
EXE_POSTFIX := .exe EXE_POSTFIX := .exe
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as DLLTOOL = $(Q)$(PREFIX)dlltool --as=$(PREFIX)as
# #
# Do not change NASM_CMD to NASM because older versions of # Do not change NASM_CMD to NASM because older versions of
# nasm doesn't like an environment variable NASM # nasm doesn't like an environment variable NASM
# #
NASM_CMD = nasmw NASM_CMD = $(Q)nasmw
DOSCLI = yes DOSCLI = yes
FLOPPY_DIR = A: FLOPPY_DIR = A:
SEP := \$(EMPTY_VAR) SEP := \$(EMPTY_VAR)
@ -80,38 +92,41 @@ endif
endif endif
CC = $(PREFIX)gcc CC = $(Q)$(PREFIX)gcc
CXX = $(PREFIX)g++ CXX = $(Q)$(PREFIX)g++
HOST_CC = gcc HOST_CC = $(Q)gcc
HOST_CXX = g++ HOST_CXX = $(Q)g++
HOST_AR = ar HOST_AR = $(Q)ar
HOST_NM = nm HOST_NM = $(Q)nm
LD = $(PREFIX)ld LD = $(Q)$(PREFIX)ld
NM = $(PREFIX)nm NM = $(Q)$(PREFIX)nm
OBJCOPY = $(PREFIX)objcopy OBJCOPY = $(Q)$(PREFIX)objcopy
STRIP = $(PREFIX)strip STRIP = $(Q)$(PREFIX)strip
AS = $(PREFIX)gcc -c -x assembler-with-cpp AS = $(Q)$(PREFIX)gcc -c -x assembler-with-cpp
CPP = $(PREFIX)cpp CPP = $(Q)$(PREFIX)cpp
AR = $(PREFIX)ar AR = $(Q)$(PREFIX)ar
RC = $(PREFIX)windres RC = $(Q)$(PREFIX)windres
WRC = $(WINE_TOP)/tools/wrc/wrc WRC = $(Q)$(WINE_TOP)/tools/wrc/wrc
OBJCOPY = $(PREFIX)objcopy OBJCOPY = $(Q)$(PREFIX)objcopy
OBJDUMP =$(PREFIX)objdump OBJDUMP =$(Q)$(PREFIX)objdump
TOOLS_PATH = $(PATH_TO_TOP)/tools TOOLS_PATH = $(PATH_TO_TOP)/tools
W32API_PATH = $(PATH_TO_TOP)/w32api W32API_PATH = $(PATH_TO_TOP)/w32api
CP = $(TOOLS_PATH)/rcopy CP = $(Q)$(TOOLS_PATH)/rcopy
RM = $(TOOLS_PATH)/rdel RM = $(Q)$(TOOLS_PATH)/rdel
RLINE = $(TOOLS_PATH)/rline RLINE = $(Q)$(TOOLS_PATH)/rline
RMDIR = $(TOOLS_PATH)/rrmdir RMDIR = $(Q)$(TOOLS_PATH)/rrmdir
RMKDIR = $(TOOLS_PATH)/rmkdir RMKDIR = $(Q)$(TOOLS_PATH)/rmkdir
RSYM = $(TOOLS_PATH)/rsym RSYM = $(Q)$(TOOLS_PATH)/rsym
RTOUCH = $(TOOLS_PATH)/rtouch RTOUCH = $(Q)$(TOOLS_PATH)/rtouch
REGTESTS = $(TOOLS_PATH)/regtests REGTESTS = $(Q)$(TOOLS_PATH)/regtests
MC = $(TOOLS_PATH)/wmc/wmc MC = $(Q)$(TOOLS_PATH)/wmc/wmc
CABMAN = $(TOOLS_PATH)/cabman/cabman CABMAN = $(Q)$(TOOLS_PATH)/cabman/cabman
WINEBUILD = $(TOOLS_PATH)/winebuild/winebuild WINEBUILD = $(Q)$(TOOLS_PATH)/winebuild/winebuild
WINE2ROS = $(TOOLS_PATH)/wine2ros/wine2ros WINE2ROS = $(Q)$(TOOLS_PATH)/wine2ros/wine2ros
XSLTPROC = xsltproc MKHIVE = $(Q)$(TOOLS_PATH)/mkhive/mkhive
CDMAKE = $(Q)$(TOOLS_PATH)/cdmake/cdmake
BIN2RES = $(Q)$(TOOLS_PATH)/bin2res/bin2res
XSLTPROC = $(Q)xsltproc
STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=i386 -D_M_IX86 STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=i386 -D_M_IX86
STD_CPPFLAGS = $(STD_CFLAGS) STD_CPPFLAGS = $(STD_CFLAGS)

6
reactos/tools/Makefile
View file

@ -144,8 +144,8 @@ clean:
$(MAKE) -C wine2ros clean $(MAKE) -C wine2ros clean
$(MAKE) -C winebuild clean $(MAKE) -C winebuild clean
$(MAKE) -C bin2res clean $(MAKE) -C bin2res clean
rm mkconfig @rm mkconfig
rm $(TOOLS) @rm $(TOOLS)
endif endif
ifeq ($(HOST),mingw32-windows) ifeq ($(HOST),mingw32-windows)
clean: clean:
@ -158,7 +158,7 @@ clean:
$(MAKE) -C wine2ros clean $(MAKE) -C wine2ros clean
$(MAKE) -C winebuild clean $(MAKE) -C winebuild clean
$(MAKE) -C bin2res clean $(MAKE) -C bin2res clean
-del *$(EXE_POSTFIX) -@del *$(EXE_POSTFIX)
endif endif
.PHONY: all clean .PHONY: all clean

19
reactos/tools/helper.mk
View file

@ -1,4 +1,4 @@
# $Id: helper.mk,v 1.69 2004/06/21 20:55:16 hyperion Exp $ # $Id: helper.mk,v 1.70 2004/07/21 18:17:50 chorns Exp $
# #
# Helper makefile for ReactOS modules # Helper makefile for ReactOS modules
# Variables this makefile accepts: # Variables this makefile accepts:
@ -654,7 +654,7 @@ endif
ifeq ($(TARGET_REGTESTS),yes) ifeq ($(TARGET_REGTESTS),yes)
REGTEST_TARGETS := tests/_regtests.c tests/Makefile.tests tests/_rtstub.c REGTEST_TARGETS := tests/_regtests.c tests/Makefile.tests tests/_rtstub.c
ifeq ($(MK_MODE),user) ifeq ($(MK_MODE),user)
MK_LIBS := $(SDK_PATH_LIB)/rtshared.a $(MK_LIBS) MK_LIBS := $(SDK_PATH_LIB)/rtshared.a $(MK_LIBS)
endif endif
MK_REGTESTS_CLEAN := clean_regtests MK_REGTESTS_CLEAN := clean_regtests
MK_OBJECTS += tests/_rtstub.o tests/regtests.a MK_OBJECTS += tests/_rtstub.o tests/regtests.a
@ -700,7 +700,10 @@ else
MK_EXTRACMD2 := MK_EXTRACMD2 :=
endif endif
$(MK_NOSTRIPNAME): $(MK_FULLRES) $(MK_OBJECTS) $(MK_EXTRADEP) $(MK_LIBS) $(MK_BASENAME).a: $(MK_OBJECTS)
$(AR) -r $(MK_BASENAME).a $(MK_OBJECTS)
$(MK_NOSTRIPNAME): $(MK_FULLRES) $(MK_BASENAME).a $(MK_EXTRADEP) $(MK_LIBS)
ifeq ($(MK_EXETYPE),dll) ifeq ($(MK_EXETYPE),dll)
$(LD_CC) -Wl,--base-file,base.tmp \ $(LD_CC) -Wl,--base-file,base.tmp \
-Wl,--entry,$(TARGET_ENTRY) \ -Wl,--entry,$(TARGET_ENTRY) \
@ -778,6 +781,7 @@ ifneq ($(TARGET_CPPAPP),yes)
else else
- $(RM) temp.exp - $(RM) temp.exp
endif endif
@echo $(MK_FULLNAME) was successfully built.
endif # KM_MODE endif # KM_MODE
@ -854,6 +858,7 @@ ifneq ($(TARGET_CPPAPP),yes)
else else
- $(RM) temp.exp - $(RM) temp.exp
endif endif
@echo $(MK_FULLNAME) was successfully built.
endif # MK_MODE endif # MK_MODE
@ -862,6 +867,7 @@ ifeq ($(MK_MODE),static)
$(MK_FULLNAME): $(TARGET_OBJECTS) $(MK_FULLNAME): $(TARGET_OBJECTS)
$(AR) -r $(MK_FULLNAME) $(TARGET_OBJECTS) $(AR) -r $(MK_FULLNAME) $(TARGET_OBJECTS)
@echo $(MK_BASENAME)$(MK_EXT) was successfully built.
# Static libraries dont have a nostrip version # Static libraries dont have a nostrip version
$(MK_NOSTRIPNAME): $(MK_NOSTRIPNAME):
@ -936,6 +942,7 @@ ifeq ($(INSTALL_SYMBOLS),yes)
install: $(SUBDIRS:%=%_install) $(MK_FULLNAME) $(MK_BASENAME).sym install: $(SUBDIRS:%=%_install) $(MK_FULLNAME) $(MK_BASENAME).sym
-$(CP) $(MK_FULLNAME) $(INSTALL_DIR)/$(MK_INSTALLDIR)/$(MK_FULLNAME) -$(CP) $(MK_FULLNAME) $(INSTALL_DIR)/$(MK_INSTALLDIR)/$(MK_FULLNAME)
-$(CP) $(MK_BASENAME).sym $(INSTALL_DIR)/symbols/$(MK_BASENAME).sym -$(CP) $(MK_BASENAME).sym $(INSTALL_DIR)/symbols/$(MK_BASENAME).sym
@echo $(MK_FULLNAME) was successfully installed.
else # INSTALL_SYMBOLS else # INSTALL_SYMBOLS
@ -969,10 +976,10 @@ endif # MK_IMPLIBONLY
ifeq ($(TARGET_TYPE),winedll) ifeq ($(TARGET_TYPE),winedll)
Makefile.ros: Makefile.in Makefile.ros-template Makefile.ros: Makefile.in Makefile.ros-template
$(TOOLS_PATH)/wine2ros/wine2ros Makefile.in Makefile.ros-template Makefile.ros $(WINE2ROS) Makefile.in Makefile.ros-template Makefile.ros
$(MK_RC_BINARIES): $(TARGET_RC_BINSRC) $(MK_RC_BINARIES): $(TARGET_RC_BINSRC)
$(TOOLS_PATH)/bin2res/bin2res -f -o $@ $(TARGET_RC_BINSRC) $(BIN2RES) -f -o $@ $(TARGET_RC_BINSRC)
$(MK_RESOURCE): $(MK_RC_BINARIES) $(MK_RESOURCE): $(MK_RC_BINARIES)
endif endif
@ -1074,5 +1081,3 @@ endif # ROS_USE_PCH
# Compatibility # Compatibility
CFLAGS := $(TARGET_CFLAGS) CFLAGS := $(TARGET_CFLAGS)
NFLAGS := $(TARGET_NFLAGS) NFLAGS := $(TARGET_NFLAGS)
# EOF

2
reactos/tools/regtests.c
View file

@ -632,7 +632,5 @@ int main(int argc, char **argv)
} }
} }
printf("Successfully generated regression test registrations.\n");
return 0; return 0;
} }

2
reactos/tools/wine2ros/wine2ros.c
View file

@ -649,8 +649,6 @@ write_makefile(PMAKEFILE_INFO makefile_info)
} while (1); } while (1);
close_file(); close_file();
printf("ReactOS makefile successfully generated.\n");
} }
static char HELP[] = static char HELP[] =