From e9160dbcfa68494b154bbd59f95707e857a84959 Mon Sep 17 00:00:00 2001 From: Asanka Herath Date: Wed, 2 Jun 2010 21:07:22 -0400 Subject: [PATCH] Support parallelized builds on Windows --- lib/asn1/NTMakefile | 8 ++------ lib/gssapi/NTMakefile | 46 ++++++++++++++++++++++------------------------ lib/hcrypto/NTMakefile | 4 ++-- lib/hdb/NTMakefile | 8 ++++---- lib/kadm5/NTMakefile | 4 ++-- lib/krb5/NTMakefile | 8 ++++---- lib/roken/NTMakefile | 4 ++-- lib/wind/NTMakefile | 4 ++-- windows/NTMakefile.w32 | 36 +++++++++++++++++++++++------------- 9 files changed, 63 insertions(+), 59 deletions(-) diff --git a/lib/asn1/NTMakefile b/lib/asn1/NTMakefile index 3462b292b..92a9696aa 100644 --- a/lib/asn1/NTMakefile +++ b/lib/asn1/NTMakefile @@ -31,6 +31,8 @@ RELDIR=lib\asn1 +intcflags=-I$(SRCDIR) -I$(OBJ) + !include ../../windows/NTMakefile.w32 gen_files_k5 = \ @@ -768,9 +770,3 @@ test-run: test:: test-binaries test-run -{$(OBJ)}.c{$(OBJ)}.obj: - $(C2OBJ) -I$(SRCDIR) -I$(OBJ) - -{}.c{$(OBJ)}.obj: - $(C2OBJ) -I$(SRCDIR) -I$(OBJ) - diff --git a/lib/gssapi/NTMakefile b/lib/gssapi/NTMakefile index 6f321b732..9571dbaef 100644 --- a/lib/gssapi/NTMakefile +++ b/lib/gssapi/NTMakefile @@ -91,7 +91,6 @@ mechsrc = \ mech/context.h \ mech/context.c \ mech/cred.h \ - mech/doxygen.c \ mech/gss_accept_sec_context.c \ mech/gss_acquire_cred.c \ mech/gss_add_cred.c \ @@ -309,7 +308,6 @@ libgssapi_OBJs = \ $(OBJ)\krb5/verify_mic.obj \ $(OBJ)\krb5/wrap.obj \ $(OBJ)\mech/context.obj \ - $(OBJ)\mech/doxygen.obj \ $(OBJ)\mech/gss_accept_sec_context.obj \ $(OBJ)\mech/gss_acquire_cred.obj \ $(OBJ)\mech/gss_add_cred.obj \ @@ -406,38 +404,38 @@ libgssapi_OBJs = \ GCOPTS=-I$(SRCDIR) -I$(OBJ) -Igssapi -DBUILD_GSSAPI_LIB -{$(OBJ)\krb5}.c{$(OBJ)\krb5}.obj: - $(C2OBJ) -I$(OBJ)\krb5 $(GCOPTS) +{$(OBJ)\krb5}.c{$(OBJ)\krb5}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\krb5\ -Fd$(OBJ)\krb5\ -I$(OBJ)\krb5 $(GCOPTS) -{krb5}.c{$(OBJ)\krb5}.obj: - $(C2OBJ) -I$(OBJ)\krb5 $(GCOPTS) +{krb5}.c{$(OBJ)\krb5}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\krb5\ -Fd$(OBJ)\krb5\ -I$(OBJ)\krb5 $(GCOPTS) -{$(OBJ)\mech}.c{$(OBJ)\mech}.obj: - $(C2OBJ) -I$(OBJ)\mech $(GCOPTS) +{$(OBJ)\mech}.c{$(OBJ)\mech}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\mech\ -Fd$(OBJ)\mech\ -I$(OBJ)\mech $(GCOPTS) -{mech}.c{$(OBJ)\mech}.obj: - $(C2OBJ) -I$(OBJ)\mech -I$(OBJ)\gssapi $(GCOPTS) +{mech}.c{$(OBJ)\mech}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\mech\ -Fd$(OBJ)\mech\ -I$(OBJ)\mech -I$(OBJ)\gssapi $(GCOPTS) -{$(OBJ)\ntlm}.c{$(OBJ)\ntlm}.obj: - $(C2OBJ) -I$(OBJ)\ntlm $(GCOPTS) +{$(OBJ)\ntlm}.c{$(OBJ)\ntlm}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\ntlm\ -Fd$(OBJ)\ntlm\ -I$(OBJ)\ntlm $(GCOPTS) -{ntlm}.c{$(OBJ)\ntlm}.obj: - $(C2OBJ) -I$(OBJ)\ntlm $(GCOPTS) +{ntlm}.c{$(OBJ)\ntlm}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\ntlm\ -Fd$(OBJ)\ntlm\ -I$(OBJ)\ntlm $(GCOPTS) -{$(OBJ)\spnego}.c{$(OBJ)\spnego}.obj: - $(C2OBJ) -I$(OBJ)\spnego $(GCOPTS) +{$(OBJ)\spnego}.c{$(OBJ)\spnego}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\spnego\ -Fd$(OBJ)\spnego\ -I$(OBJ)\spnego $(GCOPTS) -{spnego}.c{$(OBJ)\spnego}.obj: - $(C2OBJ) -I$(OBJ)\spnego -Imech $(GCOPTS) +{spnego}.c{$(OBJ)\spnego}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\spnego\ -Fd$(OBJ)\spnego\ -I$(OBJ)\spnego -Imech $(GCOPTS) -{$(OBJ)\gssapi}.c{$(OBJ)\gssapi}.obj: - $(C2OBJ) -I$(OBJ)\gssapi $(GCOPTS) +{$(OBJ)\gssapi}.c{$(OBJ)\gssapi}.obj:: + $(C2OBJ_NP) -Fo$(OBJ)\gssapi\ -Fd$(OBJ)\gssapi\ -I$(OBJ)\gssapi $(GCOPTS) -{}.c{$(OBJ)}.obj: - $(C2OBJ) $(GCOPTS) +{}.c{$(OBJ)}.obj:: + $(C2OBJ_P) $(GCOPTS) -{$(OBJ)}.c{$(OBJ)}.obj: - $(C2OBJ) $(GCOPTS) +{$(OBJ)}.c{$(OBJ)}.obj:: + $(C2OBJ_P) $(GCOPTS) {$(OBJ)\spnego}.x{$(OBJ)\spnego}.c: $(CP) $** $@ diff --git a/lib/hcrypto/NTMakefile b/lib/hcrypto/NTMakefile index 6f6b8c10b..9ac0d0015 100644 --- a/lib/hcrypto/NTMakefile +++ b/lib/hcrypto/NTMakefile @@ -139,8 +139,8 @@ $(LIBHCRYPTO): $(libhcrypto_OBJs) !endif -{imath/}.c{$(OBJ)}.obj: - $(C2OBJ) +{imath/}.c{$(OBJ)}.obj:: + $(C2OBJ_P) all:: $(LIBHCRYPTO) diff --git a/lib/hdb/NTMakefile b/lib/hdb/NTMakefile index dd5dd3b9d..3fa4de515 100644 --- a/lib/hdb/NTMakefile +++ b/lib/hdb/NTMakefile @@ -187,9 +187,9 @@ openldap_inc_flag= hdb_cflags=$(openldap_inc_flag) -I$(OBJ) -{}.c{$(OBJ)}.obj: - $(C2OBJ) $(hdb_cflags) +{}.c{$(OBJ)}.obj:: + $(C2OBJ_P) $(hdb_cflags) -{$(OBJ)}.c{$(OBJ)}.obj: - $(C2OBJ) $(hdb_cflags) +{$(OBJ)}.c{$(OBJ)}.obj:: + $(C2OBJ_P) $(hdb_cflags) diff --git a/lib/kadm5/NTMakefile b/lib/kadm5/NTMakefile index 029893d0d..7e163b749 100644 --- a/lib/kadm5/NTMakefile +++ b/lib/kadm5/NTMakefile @@ -259,5 +259,5 @@ test-run: {}.h{$(KADM5INCDIR)}.h: $(CP) $< $@ -{}.c{$(OBJ)}.obj: - $(C2OBJ) -I$(OBJ) -I$(KADM5INCDIR) \ No newline at end of file +{}.c{$(OBJ)}.obj:: + $(C2OBJ_P) -I$(OBJ) -I$(KADM5INCDIR) \ No newline at end of file diff --git a/lib/krb5/NTMakefile b/lib/krb5/NTMakefile index 5ac2b6a59..36ac9deff 100644 --- a/lib/krb5/NTMakefile +++ b/lib/krb5/NTMakefile @@ -356,11 +356,11 @@ $(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBKRB5) $(LIBROKE $(_VC_MANIFEST_CLEAN) $(_CODESIGN) -{}.c{$(OBJ)}.obj: - $(C2OBJ) -DBUILD_KRB5_LIB +{}.c{$(OBJ)}.obj:: + $(C2OBJ_P) -DBUILD_KRB5_LIB -{$(OBJ)}.c{$(OBJ)}.obj: - $(C2OBJ) -DBUILD_KRB5_LIB +{$(OBJ)}.c{$(OBJ)}.obj:: + $(C2OBJ_P) -DBUILD_KRB5_LIB #---------------------------------------------------------------------- # Tests diff --git a/lib/roken/NTMakefile b/lib/roken/NTMakefile index 2ae2aa0f8..700194ed1 100644 --- a/lib/roken/NTMakefile +++ b/lib/roken/NTMakefile @@ -112,8 +112,8 @@ libroken_la_OBJS = \ $(OBJ)\warnx.obj \ $(OBJ)\xfree.obj -{}.c{$(OBJ)}.obj: - $(C2OBJ) -DBUILD_ROKEN_LIB +{}.c{$(OBJ)}.obj:: + $(C2OBJ_P) -DBUILD_ROKEN_LIB $(LIBROKEN): $(libroken_la_OBJS) $(LIBCON_C) -out:$@ @<< diff --git a/lib/wind/NTMakefile b/lib/wind/NTMakefile index 404626d57..88ecd649b 100644 --- a/lib/wind/NTMakefile +++ b/lib/wind/NTMakefile @@ -120,8 +120,8 @@ TEST_BINARIES=\ $(OBJ)\test-ldap.exe \ $(OBJ)\test-utf8.exe -{$(OBJ)}.c{$(OBJ)}.obj: - $(C2OBJ) -I$(SRCDIR) +{$(OBJ)}.c{$(OBJ)}.obj:: + $(C2OBJ_P) -I$(SRCDIR) {$(OBJ)}.obj{$(OBJ)}.exe: $(EXECONLINK) $(LIBWIND) $(LIBROKEN) diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32 index bde9aa200..c733c27b4 100644 --- a/windows/NTMakefile.w32 +++ b/windows/NTMakefile.w32 @@ -160,7 +160,7 @@ libmach=/machine:X64 !ifndef STATICRUNTIME -C2OBJ_C = $(CC) $(cdebug) $(cflags) $(cvarsdll) $(AUXCFLAGS) $(cdefines) $(cincdirs) $(cwarn) +C2OBJ_C = $(CC) $(cdebug) $(cflags) $(cvarsdll) $(AUXCFLAGS) $(intcflags) $(cdefines) $(cincdirs) $(cwarn) EXECONLINK_C = $(LINK) $(ldebug) $(conlflags) $(conlibsdll) EXEGUILINK_C = $(LINK) $(ldebug) $(guilflags) $(guilibsdll) DLLCONLINK_C = $(LINK) $(ldebug) $(dlllflags) $(conlibsdll) @@ -168,7 +168,7 @@ DLLGUILINK_C = $(LINK) $(ldebug) $(dlllflags) $(guilibsdll) !else # STATICRUNTIME -C2OBJ_C = $(CC) $(cdebug) $(cflags) $(cvarsmt) $(AUXCFLAGS) $(cdefines) $(cincdirs) $(cwarn) +C2OBJ_C = $(CC) $(cdebug) $(cflags) $(cvarsmt) $(AUXCFLAGS) $(intcflags) $(cdefines) $(cincdirs) $(cwarn) EXECONLINK_C = $(LINK) $(ldebug) $(conlflags) $(conlibsmt) EXEGUILINK_C = $(LINK) $(ldebug) $(guilflags) $(guilibsmt) DLLCONLINK_C = $(LINK) $(ldebug) $(dlllflags) $(conlibsmt) @@ -180,6 +180,8 @@ LIBGUI_C = $(LM) /nologo $(libmach) /SUBSYSTEM:WINDOWS LIBCON_C = $(LM) /nologo $(libmach) /SUBSYSTEM:CONSOLE C2OBJ = $(C2OBJ_C) -Fo$@ -Fd$(@D)\ $** +C2OBJ_NP = $(C2OBJ_C) -MP $< +C2OBJ_P = $(C2OBJ_NP) -Fo$(OBJ)\ -Fd$(OBJ)\ # EXECONLINK = $(EXECONLINK_C) -OUT:$@ $** EXEGUILINK = $(EXEGUILINK_C) -OUT:$@ $** DLLCONLINK = $(DLLCONLINK_C) -OUT:$@ $** @@ -249,17 +251,25 @@ prep:: show-cmds !endif -{}.c{$(OBJ)}.obj: - $(C2OBJ) - -{$(OBJ)}.c{$(OBJ)}.obj: - $(C2OBJ) - -{}.cpp{$(OBJ)}.obj: - $(C2OBJ) - -{$(OBJ)}.cpp{$(OBJ)}.obj: - $(C2OBJ) +{}.c{$(OBJ)}.obj:: + $(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ /MP @<< +$< +<< + +{$(OBJ)}.c{$(OBJ)}.obj:: + $(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ /MP @<< +$< +<< + +{}.cpp{$(OBJ)}.obj:: + $(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ /MP @<< +$< +<< + +{$(OBJ)}.cpp{$(OBJ)}.obj:: + $(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ /MP @<< +$< +<< {}.hin{$(INCDIR)}.h: $(CP) $< $@ -- 2.11.4.GIT