Add a new recursive target "generated-files-mac", for producing the

generated files that lxs wants to feed into the Mac build system.
(First approximation, may want some fine tuning later.)

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 471fa0fdd81f0bf2779efb298544ff38843473b7..3f669107107517b97eec1a1e5bb337068b15b0c0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac-prerecurse): Depend on
+       update-autoconf-h.
+
 2006-03-08  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Check for vsnprintf and vasprintf, and for

diff --git a/src/Makefile.in b/src/Makefile.in
index 7b0f53cc4d5b8b5806cb0e15c3a99131eb6abaf4..cc2706ca6b8e7993ee3eecf3e9ab9b666e9b67d0 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -22,7 +22,7 @@ all-unix:: krb5-config
 # needs autoconf.h, but building "all" in include requires that util/et
 # have been built first.  Until we can untangle this, let's just check
 # that autoconf.h is up to date before going into any of the subdirectories.
-all-prerecurse: update-autoconf-h
+all-prerecurse generate-files-mac-prerecurse: update-autoconf-h
 update-autoconf-h:
        (cd include/krb5 && $(MAKE) all)
 

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 2817768335a21a3d6404bec16f01617f6045a9ab..edabd69db2d8e7d19819f52432fe5d1c8f1dffc4 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on ftpcmd.c.
+
 2005-01-13  Ezra Peisach  <epeisach@mit.edu>
 
        * ftpd.c: GCC 4.0 fixes... Move static declaration of gunique out

diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index 46bbf5ca1b6af874f77a4ad51cd6ec8f69869d9b..6b12fc9ca0772d3092ee916b94c33de96a404b9c 100644 (file)
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -32,6 +32,8 @@ all:: ftpd
 ftpd:  $(OBJS) $(PTY_DEPLIB) $(GSS_DEPLIBS) $(KRB4COMPAT_DEPLIBS)
        $(CC_LINK) -o $@ $(OBJS) $(FTPD_LIBS) $(PTY_LIB) $(UTIL_LIB) $(GSS_LIBS) $(KRB4COMPAT_LIBS)
 
+generate-files-mac: ftpcmd.c
+
 clean::
        $(RM) ftpd ftpcmd.c
 

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index ca5704b2a24fa66dff9b01b421b3a60af381c8c7..2daa788829a282b25287e267fda1e3579de6754c 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * pre.in (generate-files-mac): New target.
+       (generate-files-mac-prerecurse, generate-files-mac-recurse,
+       generate-files-mac-postrecurse): New helper targets.
+       * post.in (RECURSE_TARGETS): Add generate-files-mac-recurse.
+
 2006-03-06  Ken Raeburn  <raeburn@mit.edu>
 
        * shlib.conf (*-*-darwin*): Update MAKE_DYNOBJ_COMMAND, LDCOMBINE,

diff --git a/src/config/post.in b/src/config/post.in
index 35cc91a762b7fcdd9196130aa804161a60a01bbf..237ceb3181938d5b247f6d9316877f9cd4e63e1f 100644 (file)
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -143,6 +143,7 @@ $(srcdir)/$(thisconfigdir)/configure: @MAINT@ \
        -$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache
 
 RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \
+       generate-files-mac-recurse \
        check-recurse depend-recurse Makefiles-recurse install-headers-recurse
 
 # MY_SUBDIRS overrides any setting of SUBDIRS generated by the

diff --git a/src/config/pre.in b/src/config/pre.in
index 808b03f5943c120f50d1a8572afac42f7ebb14d2..31a84b1ecacd9f8a597e612e49acccc1758bb698 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -118,6 +118,11 @@ Makefiles-recurse: Makefiles-prerecurse
 Makefiles-prerecurse:
 Makefiles-postrecurse:
 
+generate-files-mac: generate-files-mac-postrecurse
+generate-files-mac-postrecurse: generate-files-mac-recurse
+generate-files-mac-recurse: generate-files-mac-prerecurse
+generate-files-mac-prerecurse:
+
 #
 # end recursion rule support
 ##############################

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 584311b05d749728cfd77c8bd72fd203b91ebdc1..1a6b9130603ecc547aafbf63acd6c06742b585f1 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on krb5.h.
+
 2006-03-07  Ken Raeburn  <raeburn@mit.edu>
 
        * k5-platform.h ({load,store}_{16,32,64}_le): Enable little-endian

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index dcd86a26fd92002adda601bc2af586547fd27d1c..15fe54b6a071a58862425e3d3316b08d3f737e75 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -16,6 +16,8 @@ all-windows::
 
 all-unix:: maybe-make-db.h-@DB_HEADER_VERSION@
 
+generate-files-mac: krb5.h
+
 maybe-make-db.h-k5:
        : db.h will be installed by util/db2
 maybe-make-db.h-sys:

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 8c2cda9fc45a8f34128ce98b4e99912fa6b62393..fa76590c5689fcb4b7619471ba19b1091b96db38 100644 (file)
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on kadmin_ct.c and
+       getdate.c.
+
 2005-11-17  Ken Raeburn  <raeburn@mit.edu>
 
        * kadmin.c: Include errno.h instead of k5-int.h.

diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index ecde8640be1d21dd06b20eaffa569c5ba9fd2be1..eb4f3143842fa3482567ca190f0860d02829f258 100644 (file)
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -29,6 +29,8 @@ install::
        $(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8
        $(INSTALL_DATA) $(srcdir)/$(PROG).local.M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).local.8
 
+generate-files-mac: kadmin_ct.c getdate.c
+
 clean::
        $(RM) $(PROG).local $(PROG) $(OBJS)
 clean-unix::

diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index fb35124a51cabed355265a0e7de2d673aa94e8be..b78f706040676a49ce0f27c2dd518bb02458702b 100644 (file)
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on ktutil_ct.c.
+
 2005-10-12  Tom Yu  <tlyu@mit.edu>
 
        * ktutil_funcs.c (ktutil_add): Fix malloc size botches reported by

diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index 2d23310a82c8f932fc85b7de97bcfb9a334b62d4..6917735df5693e2545b54a96642797fd2b06e54a 100644 (file)
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -23,6 +23,8 @@ install::
        $(INSTALL_PROGRAM) ktutil ${DESTDIR}$(ADMIN_BINDIR)/ktutil
        $(INSTALL_DATA) $(srcdir)/ktutil.M ${DESTDIR}$(ADMIN_MANDIR)/ktutil.8
 
+generate-files-mac: ktutil_ct.c
+
 # needed until we run makedepend
 ktutil_ct.c: ktutil_ct.ct
 

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 901410c170e135da9e67f2daf5caa58f79bf6920..9d71b7b0eae338aae9360e419b220249311be2f7 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on gssapi.h.
+
 2005-09-22  Tom Yu  <tlyu@mit.edu>
 
        * rel_buffer.c (generic_gss_release_buffer): Free buffer even if

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 1306b7db402a309825f4f17fce26b03a6efbd14f..a2b9e9045884370f2aef6b74802d6e700910728a 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -128,6 +128,8 @@ clean-windows::
        $(RM) $(HDRS)
        -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
+generate-files-mac: gssapi.h
+
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
 install-headers-unix install:: gssapi.h
        @set -x; for f in $(EXPORTED_HEADERS) ; \

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index f1a7cc31af5ad126d891001dbb05738fcb39061a..1f602bfe2a0eec5c91dd1f66aaab2ceb3fd81887 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on gssapi_krb5.h.
+
 2006-03-07  Jeffrey Altman <jaltman@mit.edu>
 
        * acquire_cred.c: (acquire_init_cred)

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index dd798fcf065af97e2fd6b9256179d8a5749907f1..7e76561a1d74aad3e65ac75a10f86940459415fd 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -205,6 +205,8 @@ clean-windows::
        $(RM) $(EHDRDIR)\gssapi_krb5.h
        -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
+generate-files-mac: gssapi_krb5.h
+
 ##DOS##!if 0
 gssapi_krb5.h: gssapi_krb5.hin
        @echo "Creating gssapi.h" ; \

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index b7e3710f0e4553d16a0a3056b0b1131dcea6e487..047e798e89ab78035d89639ae94ff0e49a5e2196 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on compile_et.
+
 2005-08-20  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Use K5_AC_INIT instead of AC_INIT.

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index b5baa191f9d7fcd657d39152eba21dec8eb531b9..95b8fac248d49d4ef57cbc8c72a20794c87fdeb3 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -76,6 +76,8 @@ all-windows:: $(COM_ERR_HDR)
 $(COM_ERR_HDR): com_err.h
        $(CP) com_err.h "$@"
 
+generate-files-mac: compile_et
+
 error_table.c: et_lex.lex.c 
 error_table.c: $(srcdir)/error_table.y
 

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index ea269e8e285d7d001761c2ad71d5f633ee3fa1c0..d687008ee02cb8498989b50ea89784b601411472 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on profile.h.
+
 2006-03-06  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (profile_tcl): Include $(LIBS).

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index a2d4814c8cc4dbeb95ace3fef479faced6786f91..b06b5bb61bb34c3d2d05722279cd12ffe9b1f239 100644 (file)
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -61,6 +61,8 @@ all-windows:: $(PROFILE_HDR)
 
 install-headers-unix:: includes
 
+generate-files-mac: profile.h
+
 $(PROFILE_HDR):: profile.h
        $(CP) profile.h "$@"
 

diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 5fbe428380da0c6a42766653a326acddb1fd7b62..4393b99576a282a9d61ee3c3c19a8da50d7a0ba3 100644 (file)
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (generate-files-mac): Depend on ct_c.awk, ct_c.sed,
+       std_rqs.c, and ss_err.h.
+
 2005-08-20  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Use K5_AC_INIT instead of AC_INIT.

diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 97693a9e6694a945b13b6284027d8fb9e91d6bad..356e28d8e7dd51415044746086bb7d116070b78d 100644 (file)
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -95,7 +95,9 @@ HDRS =        $(HDRDIR)/ss.h \
 
 BUILD_HDRS = ss_err.h
 SRC_HDRS = ss.h 
-SRC_HDRS_DEP = $(srcdir)/ss.h 
+SRC_HDRS_DEP = $(srcdir)/ss.h
+
+generate-files-mac: ct_c.awk ct_c.sed std_rqs.c ss_err.h
 
 includes:: $(HDRS)
 $(HDRDIR)/timestamp: