[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH 2/2] msvcrt: Use parent makefile variables to avoid dupliaction.
From:       Jacek Caban <jacek () codeweavers ! com>
Date:       2020-01-31 19:12:47
Message-ID: 11a96861-e8fe-5ab2-8f4f-af20b49b2e1d () codeweavers ! com
[Download RAW message or body]

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
---
  dlls/crtdll/Makefile.in   | 34 +++-------------------------------
  dlls/msvcr100/Makefile.in | 38 +++-----------------------------------
  dlls/msvcr110/Makefile.in | 38 +++-----------------------------------
  dlls/msvcr120/Makefile.in | 38 +++-----------------------------------
  dlls/msvcr70/Makefile.in  | 37 +++----------------------------------
  dlls/msvcr71/Makefile.in  | 37 +++----------------------------------
  dlls/msvcr80/Makefile.in  | 37 +++----------------------------------
  dlls/msvcr90/Makefile.in  | 37 +++----------------------------------
  dlls/msvcrtd/Makefile.in  | 35 +++--------------------------------
  9 files changed, 27 insertions(+), 304 deletions(-)



["0002-msvcrt-Use-parent-makefile-variables-to-avoid-dupliact.txt" (text/x-patch)]

diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in
index ac07045cb7..392428c6f1 100644
--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@@ -1,34 +1,6 @@
 EXTRADEFS = -D_MT -D_MSVCR_VER=0 -D_CRTDLL
 MODULE    = crtdll.dll
-PARENTSRC = ../msvcrt
-DELAYIMPORTS = advapi32 user32
 
-C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mbcs.c \
-	misc.c \
-	process.c \
-	scanf.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+PARENTSRC    = ../msvcrt
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
+C_SRCS       = $(parent_C_SRCS)
diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in
index 03a94f8c91..a7dca3fa5a 100644
--- a/dlls/msvcr100/Makefile.in
+++ b/dlls/msvcr100/Makefile.in
@@ -1,41 +1,9 @@
 EXTRADEFS = -D_MT -D_MSVCR_VER=100
 MODULE    = msvcr100.dll
 IMPORTLIB = msvcr100
-DELAYIMPORTS = advapi32 user32
-PARENTSRC = ../msvcrt
 
-C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	iob.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mathf.c \
-	mbcs.c \
-	misc.c \
-	onexit.c \
-	process.c \
-	scanf.c \
-	scheduler.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+PARENTSRC    = ../msvcrt
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
+C_SRCS       = $(parent_C_SRCS)
 
 RC_SRCS = rsrc.rc
diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in
index c29fa23a7a..ff49e64616 100644
--- a/dlls/msvcr110/Makefile.in
+++ b/dlls/msvcr110/Makefile.in
@@ -1,39 +1,7 @@
 EXTRADEFS = -D_MT -D_MSVCR_VER=110
 MODULE    = msvcr110.dll
 IMPORTLIB = msvcr110
-DELAYIMPORTS = advapi32 user32
-PARENTSRC = ../msvcrt
 
-C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	iob.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mathf.c \
-	mbcs.c \
-	misc.c \
-	onexit.c \
-	process.c \
-	scanf.c \
-	scheduler.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+PARENTSRC    = ../msvcrt
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
+C_SRCS       = $(parent_C_SRCS)
diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in
index 57b9c8a94d..128068bb1c 100644
--- a/dlls/msvcr120/Makefile.in
+++ b/dlls/msvcr120/Makefile.in
@@ -1,39 +1,7 @@
 EXTRADEFS = -D_MT -D_MSVCR_VER=120
 MODULE    = msvcr120.dll
 IMPORTLIB = msvcr120
-DELAYIMPORTS = advapi32 user32
-PARENTSRC = ../msvcrt
 
-C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	iob.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mathf.c \
-	mbcs.c \
-	misc.c \
-	onexit.c \
-	process.c \
-	scanf.c \
-	scheduler.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+PARENTSRC    = ../msvcrt
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
+C_SRCS       = $(parent_C_SRCS)
diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in
index 670b0b8636..c0e73caac4 100644
--- a/dlls/msvcr70/Makefile.in
+++ b/dlls/msvcr70/Makefile.in
@@ -1,38 +1,7 @@
 EXTRADEFS = -D_MT -D_MSVCR_VER=70
 MODULE    = msvcr70.dll
 IMPORTLIB = msvcr70
-DELAYIMPORTS = advapi32 user32
-PARENTSRC = ../msvcrt
 
-C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	iob.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mathf.c \
-	mbcs.c \
-	misc.c \
-	onexit.c \
-	process.c \
-	scanf.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+PARENTSRC    = ../msvcrt
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
+C_SRCS       = $(parent_C_SRCS)
diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in
index 3c719427c7..cde95a0b3d 100644
--- a/dlls/msvcr71/Makefile.in
+++ b/dlls/msvcr71/Makefile.in
@@ -1,38 +1,7 @@
 EXTRADEFS = -D_MT -D_MSVCR_VER=71
 MODULE    = msvcr71.dll
 IMPORTLIB = msvcr71
-DELAYIMPORTS = advapi32 user32
-PARENTSRC = ../msvcrt
 
-C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	iob.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mathf.c \
-	mbcs.c \
-	misc.c \
-	onexit.c \
-	process.c \
-	scanf.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+PARENTSRC    = ../msvcrt
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
+C_SRCS       = $(parent_C_SRCS)
diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in
index a3757d444d..3e91da7a28 100644
--- a/dlls/msvcr80/Makefile.in
+++ b/dlls/msvcr80/Makefile.in
@@ -1,40 +1,9 @@
 EXTRADEFS = -D_MT -D_MSVCR_VER=80
 MODULE    = msvcr80.dll
 IMPORTLIB = msvcr80
-DELAYIMPORTS = advapi32 user32
-PARENTSRC = ../msvcrt
 
-C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	iob.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mathf.c \
-	mbcs.c \
-	misc.c \
-	onexit.c \
-	process.c \
-	scanf.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+PARENTSRC    = ../msvcrt
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
+C_SRCS       = $(parent_C_SRCS)
 
 RC_SRCS = msvcr80.rc
diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in
index d4f857d6a7..93ba73270c 100644
--- a/dlls/msvcr90/Makefile.in
+++ b/dlls/msvcr90/Makefile.in
@@ -1,40 +1,9 @@
 EXTRADEFS = -D_MT -D_MSVCR_VER=90
 MODULE    = msvcr90.dll
 IMPORTLIB = msvcr90
-DELAYIMPORTS = advapi32 user32
-PARENTSRC = ../msvcrt
 
-C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	iob.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mathf.c \
-	mbcs.c \
-	misc.c \
-	onexit.c \
-	process.c \
-	scanf.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+PARENTSRC    = ../msvcrt
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
+C_SRCS       = $(parent_C_SRCS)
 
 RC_SRCS = msvcr90.rc
diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in
index 3edfcd0c03..83fb69ef7a 100644
--- a/dlls/msvcrtd/Makefile.in
+++ b/dlls/msvcrtd/Makefile.in
@@ -2,37 +2,8 @@ EXTRADEFS = -D_MT -D_MSVCR_VER=0
 MODULE    = msvcrtd.dll
 IMPORTLIB = msvcrtd
 PARENTSRC = ../msvcrt
-DELAYIMPORTS = advapi32 user32
+DELAYIMPORTS = $(parent_DELAYIMPORTS)
 
 C_SRCS = \
-	console.c \
-	cpp.c \
-	ctype.c \
-	data.c \
-	debug.c \
-	dir.c \
-	environ.c \
-	errno.c \
-	except.c \
-	except_arm.c \
-	except_arm64.c \
-	except_i386.c \
-	except_x86_64.c \
-	exit.c \
-	file.c \
-	heap.c \
-	iob.c \
-	locale.c \
-	lock.c \
-	main.c \
-	math.c \
-	mbcs.c \
-	misc.c \
-	onexit.c \
-	process.c \
-	scanf.c \
-	string.c \
-	thread.c \
-	time.c \
-	undname.c \
-	wcs.c
+	$(parent_C_SRCS) \
+	debug.c



[prev in list] [next in list] [prev in thread] [next in thread]