[ofw] [PATCH 4/?] Don't define an empty custom_target to cause makefile.inc to be processed
Fab Tillier
ftillier at microsoft.com
Mon Jun 18 18:37:11 PDT 2012
Many components have a "Custom_target" defined to force inclusion of makefile.inc during the build. Use the USE_MAKEFILE_INC build macro instead.
Signed-off-by: Fab Tillier <ftillier at microsoft.com>
Index: tools/perftests/user/send_bw/SOURCES
===================================================================
--- tools/perftests/user/send_bw/SOURCES (revision 3414)
+++ tools/perftests/user/send_bw/SOURCES (working copy)
@@ -3,7 +3,7 @@
TARGETTYPE=PROGRAM
UMTYPE=console
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
C_DEFINES=$(C_DEFINES) /D__WIN__
Index: tools/perftests/user/send_bw/makefile.inc
===================================================================
--- tools/perftests/user/send_bw/makefile.inc (revision 3414)
+++ tools/perftests/user/send_bw/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\..\inc\mod_ver.def
Index: tools/perftests/user/write_bw/SOURCES
===================================================================
--- tools/perftests/user/write_bw/SOURCES (revision 3414)
+++ tools/perftests/user/write_bw/SOURCES (working copy)
@@ -3,7 +3,7 @@
TARGETTYPE=PROGRAM
UMTYPE=console
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
C_DEFINES=$(C_DEFINES) /D__WIN__
Index: tools/perftests/user/write_bw/makefile.inc
===================================================================
--- tools/perftests/user/write_bw/makefile.inc (revision 3414)
+++ tools/perftests/user/write_bw/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\..\inc\mod_ver.def
Index: tools/perftests/user/send_lat/SOURCES
===================================================================
--- tools/perftests/user/send_lat/SOURCES (revision 3414)
+++ tools/perftests/user/send_lat/SOURCES (working copy)
@@ -3,7 +3,7 @@
TARGETTYPE=PROGRAM
UMTYPE=console
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
C_DEFINES=$(C_DEFINES) /D__WIN__
Index: tools/perftests/user/send_lat/makefile.inc
===================================================================
--- tools/perftests/user/send_lat/makefile.inc (revision 3414)
+++ tools/perftests/user/send_lat/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\..\inc\mod_ver.def
Index: tools/perftests/user/write_lat/SOURCES
===================================================================
--- tools/perftests/user/write_lat/SOURCES (revision 3414)
+++ tools/perftests/user/write_lat/SOURCES (working copy)
@@ -3,7 +3,7 @@
TARGETTYPE=PROGRAM
UMTYPE=console
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
C_DEFINES=$(C_DEFINES) /D__WIN__
Index: tools/perftests/user/write_lat/makefile.inc
===================================================================
--- tools/perftests/user/write_lat/makefile.inc (revision 3414)
+++ tools/perftests/user/write_lat/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\..\inc\mod_ver.def
Index: tools/perftests/user/read_bw/SOURCES
===================================================================
--- tools/perftests/user/read_bw/SOURCES (revision 3414)
+++ tools/perftests/user/read_bw/SOURCES (working copy)
@@ -3,7 +3,7 @@
TARGETTYPE=PROGRAM
UMTYPE=console
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
C_DEFINES=$(C_DEFINES) /D__WIN__
Index: tools/perftests/user/read_bw/makefile.inc
===================================================================
--- tools/perftests/user/read_bw/makefile.inc (revision 3414)
+++ tools/perftests/user/read_bw/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\..\inc\mod_ver.def
Index: tools/perftests/user/read_lat/SOURCES
===================================================================
--- tools/perftests/user/read_lat/SOURCES (revision 3414)
+++ tools/perftests/user/read_lat/SOURCES (working copy)
@@ -3,7 +3,7 @@
TARGETTYPE=PROGRAM
UMTYPE=console
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
C_DEFINES=$(C_DEFINES) /D__WIN__
Index: tools/perftests/user/read_lat/makefile.inc
===================================================================
--- tools/perftests/user/read_lat/makefile.inc (revision 3414)
+++ tools/perftests/user/read_lat/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\..\inc\mod_ver.def
Index: tools/vstat/user/SOURCES
===================================================================
--- tools/vstat/user/SOURCES (revision 3414)
+++ tools/vstat/user/SOURCES (working copy)
@@ -3,7 +3,7 @@
TARGETTYPE=PROGRAM
UMTYPE=console
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
SOURCES=vstat.rc \
vstat_main.c
Index: tools/vstat/user/makefile.inc
===================================================================
--- tools/vstat/user/makefile.inc (revision 3414)
+++ tools/vstat/user/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\inc\mod_ver.def
Index: core/winmad/user/SOURCES
===================================================================
--- core/winmad/user/SOURCES (revision 3414)
+++ core/winmad/user/SOURCES (working copy)
@@ -3,13 +3,9 @@
TARGETPATH = ..\..\..\bin\user\obj$(BUILD_ALT_DIR)
TARGETTYPE = DYNLINK
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC = 1
-!if $(_NT_TOOLS_VERSION) == 0x700
-DLLDEF = $O\wm_exports.def
-!else
DLLDEF = $(OBJ_PATH)\$O\wm_exports.def
-!endif
DLLENTRY = DllMain
USE_NTDLL = 1
Index: core/winmad/user/makefile.inc
===================================================================
--- core/winmad/user/makefile.inc (revision 3414)
+++ core/winmad/user/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\inc\mod_ver.def
Index: core/complib/user/SOURCES
===================================================================
--- core/complib/user/SOURCES (revision 3414)
+++ core/complib/user/SOURCES (working copy)
@@ -3,16 +3,12 @@
TARGETPATH=..\..\..\bin\user\obj$(BUILD_ALT_DIR)
TARGETTYPE=DYNLINK
DLLENTRY=DllMain
-!if $(_NT_TOOLS_VERSION) == 0x700
-# DDK
-DLLDEF=$O\complib.def
-!else
-# WDK
+
DLLDEF=$(OBJ_PATH)\$O\complib.def
-!endif
+
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
SOURCES=\
complib.rc \
Index: core/complib/user/makefile.inc
===================================================================
--- core/complib/user/makefile.inc (revision 3414)
+++ core/complib/user/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\inc\mod_ver.def
Index: core/bus/kernel/SOURCES
===================================================================
--- core/bus/kernel/SOURCES (revision 3414)
+++ core/bus/kernel/SOURCES (working copy)
@@ -8,7 +8,7 @@
#ENABLE_EVENT_TRACING=1
!endif
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
SOURCES= ibbus.rc \
bus_ev_log.mc \
Index: core/bus/kernel/makefile.inc
===================================================================
--- core/bus/kernel/makefile.inc (revision 3414)
+++ core/bus/kernel/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\inc\mod_ver.def
Index: core/al/kernel/SOURCES
===================================================================
--- core/al/kernel/SOURCES (revision 3414)
+++ core/al/kernel/SOURCES (working copy)
@@ -10,9 +10,8 @@
#ENABLE_EVENT_TRACING=1
!endif
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
-
SOURCES= ibal.rc \
al_ci_ca.c \
al_cm.c \
Index: core/al/kernel/makefile.inc
===================================================================
--- core/al/kernel/makefile.inc (revision 3414)
+++ core/al/kernel/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\inc\mod_ver.def
Index: core/al/user/SOURCES
===================================================================
--- core/al/user/SOURCES (revision 3414)
+++ core/al/user/SOURCES (working copy)
@@ -12,15 +12,9 @@
#ENABLE_EVENT_TRACING=1
!endif
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
-!if $(_NT_TOOLS_VERSION) == 0x700
-# DDK
-DLLDEF=$O\al_exports.def
-!else
-# WDK
DLLDEF=$(OBJ_PATH)\$O\al_exports.def
-!endif
USE_NTDLL=1
Index: core/al/user/makefile.inc
===================================================================
--- core/al/user/makefile.inc (revision 3414)
+++ core/al/user/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\inc\mod_ver.def
Index: hw/mlx4/kernel/l2w/SOURCES
===================================================================
--- hw/mlx4/kernel/l2w/SOURCES (revision 3414)
+++ hw/mlx4/kernel/l2w/SOURCES (working copy)
@@ -14,7 +14,7 @@
DLLDEF=l2w.def
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
SOURCES= \
l2w.rc \
Index: hw/mlx4/kernel/l2w/makefile.inc
===================================================================
--- hw/mlx4/kernel/l2w/makefile.inc (revision 3414)
+++ hw/mlx4/kernel/l2w/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\..\inc\mod_ver.def
Index: hw/mlx4/kernel/bus/net/SOURCES
===================================================================
--- hw/mlx4/kernel/bus/net/SOURCES (revision 3414)
+++ hw/mlx4/kernel/bus/net/SOURCES (working copy)
@@ -12,10 +12,10 @@
USECXX_FLAG=1
+USE_MAKEFILE_INC=1
+
DLLDEF=net.def
-NTTARGETFILES=Custom_target
-
SOURCES= net.rc \
alloc.c \
catas.c \
Index: hw/mlx4/kernel/bus/net/makefile.inc
===================================================================
--- hw/mlx4/kernel/bus/net/makefile.inc (revision 3414)
+++ hw/mlx4/kernel/bus/net/makefile.inc (working copy)
@@ -1,7 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-!INCLUDE ..\..\..\..\..\inc\mod_ver.def
\ No newline at end of file
+!INCLUDE ..\..\..\..\..\inc\mod_ver.def
Index: hw/mlx4/kernel/bus/core/SOURCES
===================================================================
--- hw/mlx4/kernel/bus/core/SOURCES (revision 3414)
+++ hw/mlx4/kernel/bus/core/SOURCES (working copy)
@@ -2,8 +2,6 @@
TARGETPATH=..\..\..\..\..\bin\kernel\obj$(BUILD_ALT_DIR)
TARGETTYPE=DRIVER_LIBRARY
-
-
!if $(FREEBUILD)
ENABLE_EVENT_TRACING=1
!else
@@ -14,7 +12,7 @@
DLLDEF=core.def
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
SOURCES= \
ev_log.mc \
Index: hw/mlx4/kernel/bus/core/makefile.inc
===================================================================
--- hw/mlx4/kernel/bus/core/makefile.inc (revision 3414)
+++ hw/mlx4/kernel/bus/core/makefile.inc (working copy)
@@ -1,7 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
!INCLUDE ..\..\..\..\..\inc\mod_ver.def
Index: hw/mlx4/kernel/bus/ib/SOURCES
===================================================================
--- hw/mlx4/kernel/bus/ib/SOURCES (revision 3414)
+++ hw/mlx4/kernel/bus/ib/SOURCES (working copy)
@@ -12,8 +12,8 @@
USECXX_FLAG=1
+USE_MAKEFILE_INC=1
DLLDEF=ib.def
-NTTARGETFILES=Custom_target
SOURCES= ib.rc \
ah.c \
Index: hw/mlx4/kernel/bus/ib/makefile.inc
===================================================================
--- hw/mlx4/kernel/bus/ib/makefile.inc (revision 3414)
+++ hw/mlx4/kernel/bus/ib/makefile.inc (working copy)
@@ -1,7 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
!INCLUDE ..\..\..\..\..\inc\mod_ver.def
Index: hw/mlx4/user/hca/SOURCES
===================================================================
--- hw/mlx4/user/hca/SOURCES (revision 3414)
+++ hw/mlx4/user/hca/SOURCES (working copy)
@@ -5,16 +5,13 @@
TARGETPATH=$(TRUNK)\bin\user\obj$(BUILD_ALT_DIR)
TARGETTYPE=DYNLINK
-!if $(_NT_TOOLS_VERSION) == 0x700
-# DDK
-DLLDEF=$O\mlx4.def
-!else
-# WDK
+
DLLDEF=$(OBJ_PATH)\$O\mlx4.def
-!endif
+
USE_MSVCRT=1
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
+
!if $(FREEBUILD)
#ENABLE_EVENT_TRACING=1
!else
Index: hw/mlx4/user/hca/makefile.inc
===================================================================
--- hw/mlx4/user/hca/makefile.inc (revision 3414)
+++ hw/mlx4/user/hca/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\..\inc\mod_ver.def
Index: hw/mthca/user/SOURCES
===================================================================
--- hw/mthca/user/SOURCES (revision 3414)
+++ hw/mthca/user/SOURCES (working copy)
@@ -5,14 +5,14 @@
TARGETPATH=$(TRUNK)\bin\user\obj$(BUILD_ALT_DIR)
TARGETTYPE=DYNLINK
-# WDK
DLLDEF=$(OBJ_PATH)\$O\mlnx_uvp.def
#USE_NTDLL=1
USE_MSVCRT=1
DLLENTRY=DllMain
-NTTARGETFILES=Custom_target
+USE_MAKEFILE_INC=1
+
!if $(FREEBUILD)
ENABLE_EVENT_TRACING=1
!else
@@ -62,7 +62,7 @@
!if !$(FREEBUILD)
-C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG
+C_DEFINES=$(C_DEFINES) -D_DEBUG -DDEBUG -DDBG=1
!endif
#LINKER_FLAGS=/MAP /MAPINFO:LINES
Index: hw/mthca/user/makefile.inc
===================================================================
--- hw/mthca/user/makefile.inc (revision 3414)
+++ hw/mthca/user/makefile.inc (working copy)
@@ -1,8 +1 @@
-Custom_target:
-!if "$(BUILD_PASS)" == "PASS2" || "$(BUILD_PASS)" == "ALL"
-
-!endif
-
-
-
!INCLUDE ..\..\..\inc\mod_ver.def
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 4.custom_target.patch
Type: application/octet-stream
Size: 14509 bytes
Desc: 4.custom_target.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20120619/fafd71e1/attachment.obj>
More information about the ofw
mailing list