pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / windows / Makefile.in

diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index f1a46c0df29a052ce9e5fc53247512b98fbb6ea0..9cadd576d625cab1299e6932bcc6d7d85666ca0b 100644 (file)
--- a/src/windows/Makefile.in
+++ b/src/windows/Makefile.in
@@ -1,76 +1,6 @@
 BUILDTOP=..
 NO_OUTPRE=1
-
-#
-# Makefile that recurses into cns subdirectory.
-#
-all-windows:: ntsecapitest
-       @echo Making in windows\lib
-       cd lib
-       $(MAKE) -$(MFLAGS)
-       @echo Making in windows\cns
-       cd ..\cns
-       $(MAKE) -$(MFLAGS)
-       @echo Making in windows\wintel
-       cd ..\wintel
-       $(MAKE) -$(MFLAGS)
-       @echo Making in windows\gss
-       cd ..\gss
-       cd
-       $(MAKE) -$(MFLAGS)
-       @echo Making in windows\gina
-       cd ..\gina
-       $(MAKE) -$(MFLAGS)
-       @echo Making in windows\ms2mit
-       cd ..\ms2mit
-       $(MAKE) -$(MFLAGS)
-!if "$(KRB5_KFW_COMPILE)"=="1" 
-        @echo Making in windows\kfwlogon
-        cd ..\kfwlogon
-        $(MAKE) -$(MFLAGS) 
-        @echo Making in windows\identity 
-        cd ..\identity 
-        $(MAKE) -$(MFLAGS) 
-!endif 
-       cd ..
-
-clean-windows:: clean-ntsecapitest
-       @echo Making clean in windows\lib
-       cd lib
-       $(MAKE) -$(MFLAGS) clean
-       @echo Making clean in windows\cns
-       cd ..\cns
-       $(MAKE) -$(MFLAGS) clean
-       @echo Making clean in windows\wintel
-       cd ..\wintel
-       $(MAKE) -$(MFLAGS) clean
-       @echo Making clean in windows\gss
-       cd ..\gss
-       $(MAKE) -$(MFLAGS) clean
-       @echo Making clean in windows\gina
-       cd ..\gina
-       $(MAKE) -$(MFLAGS) clean
-       @echo Making clean in windows\ms2mit
-       cd ..\ms2mit
-       $(MAKE) -$(MFLAGS) clean
-!if "$(KRB5_KFW_COMPILE)"=="1" 
-        @echo Making clean in windows\kfwlogon
-        cd ..\kfwlogon
-        $(MAKE) -$(MFLAGS) clean 
-        @echo Making clean in windows\identity 
-        cd ..\identity 
-        $(MAKE) -$(MFLAGS) clean 
-!endif 
-       cd ..
-
-# If ntsecapi.h contains the string that indicates it came from the Vista SDK,
-#  then ntsecapitest.i will be left behind.  If the string is not present,
-#  ntsecapitest.i will be deleted. 
-ntsecapitest:: ntsecapitest.i
-    ntsecapitest.pl
-
-clean-ntsecapitest::
-    $(RM) ntsecapitest.i
-
-{}.c{}.i:
-    @$(C_RULE) -P
+!if "$(KRB5_KFW_COMPILE)"=="1"
+KFWLOGON= kfwlogon
+!endif
+SUBDIRS= lib cns gss gina ms2mit $(KFWLOGON)