Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 05:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add ROS_AUTOMAKE variable to determine the location of makefile.auto

Browse source 
- Allows multiple configurations to be used in the same tree

svn path=/trunk/; revision=19848
This commit is contained in:
Art Yerkes 2005-12-04 07:58:46 +00:00
parent 0a36bfb449
commit f68caa66a7
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/Makefile
View file

@ -106,6 +106,11 @@
# -mi Let make handle creation of install directories. Rbuild will not generate the directories. # -mi Let make handle creation of install directories. Rbuild will not generate the directories.
# -ps Generate proxy makefiles in source tree instead of the output tree. # -ps Generate proxy makefiles in source tree instead of the output tree.
# -ud Disable compilation units. # -ud Disable compilation units.
# -r Input XML
#
# ROS_AUTOMAKE
# Alternate name of makefile.auto
#
# check for versions of make that don't have features we need... # check for versions of make that don't have features we need...
# the function "eval" is only available in 3.80+, which happens to be the minimum # the function "eval" is only available in 3.80+, which happens to be the minimum
@ -124,7 +129,12 @@ endif
.PHONY: all .PHONY: all
.PHONY: clean .PHONY: clean
all: makefile.auto
ifeq ($(ROS_AUTOMAKE),)
ROS_AUTOMAKE=makefile.auto
endif
all: $(ROS_AUTOMAKE)
.SUFFIXES: .SUFFIXES:
@ -336,7 +346,7 @@ ERRCODES_RC = lib$(SEP)kernel32$(SEP)errcodes.rc
include lib/lib.mak include lib/lib.mak
include tools/tools.mak include tools/tools.mak
include boot/freeldr/bootsect/bootsect.mak include boot/freeldr/bootsect/bootsect.mak
-include makefile.auto -include $(ROS_AUTOMAKE)
PREAUTO := \ PREAUTO := \
$(BIN2C_TARGET) \ $(BIN2C_TARGET) \
@ -349,7 +359,7 @@ PREAUTO := \
$(NCI_SERVICE_FILES) \ $(NCI_SERVICE_FILES) \
$(GENDIB_DIB_FILES) $(GENDIB_DIB_FILES)
makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
$(ECHO_RBUILD) $(ECHO_RBUILD)
$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw
@ -388,7 +398,7 @@ msvc8: $(RBUILD_TARGET)
.PHONY: makefile_auto_clean .PHONY: makefile_auto_clean
makefile_auto_clean: makefile_auto_clean:
-@$(rm) makefile.auto $(PREAUTO) 2>$(NUL) -@$(rm) $(ROS_AUTOMAKE) $(PREAUTO) 2>$(NUL)
.PHONY: clean .PHONY: clean
clean: makefile_auto_clean clean: makefile_auto_clean