svn rev #22501: trunk/src/ kadmin/cli/ plugins/kdb/ldap/ldap_util/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22501
Commit By: ghudson
Log Message:
Fix the LDAP build, which was broken by the build reordering in
r22406.  Build kdb5_util's getdate from the kadmin/cli getdate
source, instead of borrowing the object file from the kadmin/cli
build directory.



Changed Files:
U   trunk/src/kadmin/cli/getdate.y
U   trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in
Modified: trunk/src/kadmin/cli/getdate.y
===================================================================
--- trunk/src/kadmin/cli/getdate.y	2009-08-07 16:30:48 UTC (rev 22500)
+++ trunk/src/kadmin/cli/getdate.y	2009-08-07 19:17:57 UTC (rev 22501)
@@ -883,8 +883,9 @@
 
 /* For get_date extern declaration compatibility check... yuck.  */
 #include <krb5.h>
-#include "kadmin.h"
 
+time_t get_date(char *);
+
 time_t
 get_date(p)
     char		*p;

Modified: trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in	2009-08-07 16:30:48 UTC (rev 22500)
+++ trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in	2009-08-07 19:17:57 UTC (rev 22501)
@@ -11,16 +11,21 @@
 KDB_DEP_LIB=$(DL_LIB) -lkdb_ldap $(THREAD_LINKOPTS)
 
 PROG = kdb5_ldap_util
-OBJS = kdb5_ldap_util.o kdb5_ldap_list.o kdb5_ldap_realm.o kdb5_ldap_policy.o kdb5_ldap_services.o
+OBJS = kdb5_ldap_util.o kdb5_ldap_list.o kdb5_ldap_realm.o kdb5_ldap_policy.o kdb5_ldap_services.o getdate.o
 
-GETDATE = ../../../../kadmin/cli/getdate.o
+GETDATE = $(srcdir)/../../../../kadmin/cli/getdate.y
 
 all:: $(PROG)
 
 $(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIB) $(GETDATE)
-	$(CC_LINK) -o $(PROG) $(OBJS) $(GETDATE) \
+	$(CC_LINK) -o $(PROG) $(OBJS) \
 		$(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS)
 
+getdate.c: $(GETDATE)
+	$(RM) getdate.c y.tab.c
+	$(YACC) $(GETDATE)
+	$(MV) y.tab.c getdate.c
+
 install::
 	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
 	$(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8