execute wconfig on src/windows/kfwlogon/Makefile.in

ticket: 3254
tags: pullup
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17519 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index e12012311df846b19dea1e3a0baf33d6529147ea..9028c092c5a1391f60f7b574090d2d78299127d7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-29  Jeffrey Altman <jaltman@mit.edu>
+
+       * Makefile.in: add src/windows/kfwlogon tree
+
 2005-10-27  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute

diff --git a/src/Makefile.in b/src/Makefile.in
index 93e839b8e3e26e863f8e94a07cdb45dd9d67c5a5..edc2cbc9c6a45d12c3e3a49873341564b60c8492 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -3,9 +3,7 @@ datadir=@datadir@
 thisconfigdir=.
 myfulldir=.
 mydir=.
-SUBDIRS=util include lib @krb524@ kdc kadmin slave clients \
-       modules/kdb/db2 \
-       appl tests \
+SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
        config-files gen-manpages
 BUILDTOP=$(REL)$(C)
 LOCALINCLUDES = -I$(srcdir) 
@@ -25,11 +23,6 @@ all-prerecurse: update-autoconf-h
 update-autoconf-h:
        (cd include && $(MAKE) krb5/autoconf.h)
 
-##DOS##!if 0
-# This makefile doesn't use lib.in, but we still need shlib.conf here.
-config.status: $(SRCTOP)/config/shlib.conf
-##DOS##!endif
-
 all-windows:: maybe-awk Makefile-windows
        @echo Making autoconf.h in include\krb5
        cd include\krb5
@@ -66,7 +59,6 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROOT) $(KRB5OTHERMKDIRS) \
                $(ADMIN_BINDIR) $(SERVER_BINDIR) $(CLIENT_BINDIR) \
                $(ADMIN_MANDIR) $(SERVER_MANDIR) $(CLIENT_MANDIR) \
                $(FILE_MANDIR) $(KRB5_LIBDIR) $(KRB5_INCDIR) \
-               $(KRB5_DB_MODULE_DIR) \
                $(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR)
 
 install-strip:
@@ -89,15 +81,6 @@ install-headers-prerecurse: install-headers-mkdirs
 # install::
 #      $(MAKE) $(MFLAGS) install.man
 
-fake-install:
-       $(RM) -r $(FAKEPREFIX)
-       @for i in $(INSTALLMKDIRS); do \
-               $(srcdir)/config/mkinstalldirs util/fakedest$$i; \
-       done
-       (w=`pwd`; cd util && $(MAKE) install DESTDIR="$$w/util/fakedest")
-       (w=`pwd`; cd lib && $(MAKE) install DESTDIR="$$w/util/fakedest")
-       (w=`pwd`; cd modules/kdb/db2 && $(MAKE) install DESTDIR="$$w/util/fakedest")
-
 TAGS: $(SRCS)
        etags $(SRCS)
 
@@ -193,7 +176,7 @@ WINMAKEFILES=Makefile \
        windows\Makefile windows\lib\Makefile \
        windows\cns\Makefile windows\gina\Makefile \
        windows\gss\Makefile windows\ms2mit\Makefile \
-       windows\wintel\Makefile
+       windows\wintel\Makefile windows\kfwlogon\Makefile
 
 ##DOS##Makefile-windows:: $(MKFDEP) $(WINMAKEFILES)
 
@@ -313,6 +296,8 @@ WINMAKEFILES=Makefile \
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##windows\wintel\Makefile: windows\wintel\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
+##DOS##windows\kfwlogon\Makefile: windows\kfwlogon\Makefile.in $(MKFDEP)
+##DOS##        $(WCONFIG) config < $@.in > $@
 
 clean-windows:: Makefile-windows
        @echo Making clean in util
@@ -580,4 +565,3 @@ krb5-config: $(srcdir)/krb5-config.in $(thisconfigdir)/config.status
 # $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf
 check-unix:: krb5-config
        $(SHELL) $(srcdir)/t_krbconf
-check-prerecurse: fake-install