Delete old placeholders for framework support; implement it anew soon,

when we're more certain what we need.

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

4 files changed, 20 insertions, 45 deletions

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 2ee17c7..b7d51e1 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,5 +1,20 @@
 2002-09-13  Ken Raeburn  <raeburn@mit.edu>
 
+	* pre.in (KRB5_LIB_libopt, KRB5_LIB_frameworkopt,
+	K5CRYPTO_LIB_libopt, K5CRYPTO_LIB_frameworkopt,
+	GSS_KRB5_LIB_libopt, GSS_KRB5_LIB_frameworkopt): Variables
+	deleted.
+	(KRB5_LIB, K5CRYPTO_LIB, GSS_KRB5_LIB): Use old _libopt values.
+	* lib.in (EXTRA_CLEAN_TARGETS, EXTRA_CLEAN_LINKS): Variables
+	deleted.
+	(clean-libs, clean-liblinks): Don't depend on them.
+	(all-framework, link-framework, clean-framework,
+	clean-framework-link, install-framework): Placeholder targets
+	deleted.
+	* shlib.conf: Don't define LIB_LINK_OPT, EXTRA_LIB_TARGETS,
+	EXTRA_LIBLINK_TARGETS, EXTRA_LIBINST_TARGETS, EXTRA_CLEAN_TARGETS,
+	EXTRA_CLEAN_LINKS.
+
 	* post.in (depend-verify-et-sys, depend-verify-et-k5,
 	depend-verify-ss-sys, depend-verify-ss-k5, depend-verify-db-sys,
 	depend-verify-db-k5): New targets.  Report errors in the -sys
diff --git a/src/config/lib.in b/src/config/lib.in
index 3d9d86a..7d7bc71 100644
--- a/src/config/lib.in
+++ b/src/config/lib.in
@@ -40,10 +40,6 @@ LIBLINKS=@LIBLINKS@
 # Set by configure; list of install targets
 LIBINSTLIST=@LIBINSTLIST@
 
-# Set by configure; list of extra targets when cleaning
-EXTRA_CLEAN_TARGETS=@EXTRA_CLEAN_TARGETS@
-EXTRA_CLEAN_LINKS=@EXTRA_CLEAN_LINKS@
-
 # Some of these should really move to pre.in, since programs will need
 # it too. (e.g. stuff that has dependencies on the libraries)
 
@@ -134,36 +130,20 @@ $(TOPLIBD)/lib$(LIB)$(PFLIBEXT): lib$(LIB)$(PFLIBEXT)
 all-libs: $(LIBLIST)
 all-liblinks: $(LIBLINKS)
 
-all-framework:
-	@echo lxs, put something here in config/lib.in for building frameworks
-	@false
-
-link-framework:
-	@echo lxs, put something here in config/lib.in for symlinking frameworks
-	@false
-
-clean-libs: $(EXTRA_CLEAN_TARGETS)
+clean-libs:
 	$(RM) lib$(LIB)$(STLIBEXT)
 	$(RM) lib$(LIB)$(SHLIBVEXT)
 	$(RM) lib$(LIB)$(SHLIBSEXT)
 	$(RM) lib$(LIB)$(SHLIBEXT)
 	$(RM) lib$(LIB)$(PFLIBEXT)
 
-clean-liblinks: $(EXTRA_CLEAN_LINKS)
+clean-liblinks:
 	$(RM) $(TOPLIBD)/lib$(LIB)$(STLIBEXT)
 	$(RM) $(TOPLIBD)/lib$(LIB)$(SHLIBVEXT)
 	$(RM) $(TOPLIBD)/lib$(LIB)$(SHLIBSEXT)
 	$(RM) $(TOPLIBD)/lib$(LIB)$(SHLIBEXT)
 	$(RM) $(TOPLIBD)/lib$(LIB)$(PFLIBEXT)
 
-clean-framework:
-	@echo lxs, put something here in config/lib.in for cleaning frameworks
-	@false
-
-clean-framework-link:
-	@echo lxs, put something here in config/lib.in for cleaning framework links
-	@false
-
 install-libs: $(LIBINSTLIST)
 install-static:
 	$(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(STLIBEXT)
@@ -184,10 +164,6 @@ install-profiled:
 	$(INSTALL_DATA) lib$(LIB)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR)
 	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(PFLIBEXT)
 
-install-framework:
-	@echo lxs, put something here in config/lib.in for installing frameworks
-	@false
-
 Makefile: $(SRCTOP)/config/lib.in
 config.status: $(SRCTOP)/config/shlib.conf
 
diff --git a/src/config/pre.in b/src/config/pre.in
index 3ce05bd..e7c751c 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -262,19 +262,10 @@ SS_LIB-k5	= $(TOPLIBD)/libss.a
 KDB5_LIB	= -lkdb5
 DB_LIB		= @DB_LIB@
 
-KRB5_LIB			= $(KRB5_LIB_@LIB_LINK_OPT@)
-KRB5_LIB_libopt			= -lkrb5
-KRB5_LIB_frameworkopt		= -framework Kerberos5
-
-K5CRYPTO_LIB			= $(K5CRYPTO_LIB_@LIB_LINK_OPT@)
-K5CRYPTO_LIB_libopt		= -lk5crypto
-K5CRYPTO_LIB_frameworkopt	= -framework Kerberos5Crypto
-
+KRB5_LIB			= -lkrb5
+K5CRYPTO_LIB			= -lk5crypto
 COM_ERR_LIB			= -lcom_err
-
-GSS_KRB5_LIB			= $(GSS_KRB5_LIB_@LIB_LINK_OPT@)
-GSS_KRB5_LIB_libopt		= -lgssapi_krb5
-GSS_KRB5_LIB_frameworkopt	= -framework Krb5GSSAPILib
+GSS_KRB5_LIB			= -lgssapi_krb5
 
 # KRB4_LIB is -lkrb4 if building --with-krb4
 # needs fixing if ever used on Mac OS X!
diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index f4d5d9c..351ca08 100644
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -1,7 +1,6 @@
 #
 # Set up some defaults.
 #
-LIB_LINK_OPT=libopt
 STLIBEXT=.a
 # Default to being unable to build shared libraries.
 SHLIBEXT=.so-nobuild
@@ -208,12 +207,6 @@ mips-*-netbsd*)
 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(LDFLAGS)'
 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)'
 	RUN_ENV='DYLD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export DYLD_LIBRARY_PATH;'
-	LIB_LINK_OPT=frameworkopt
-	EXTRA_LIB_TARGETS=all-framework
-	EXTRA_LIBLINK_TARGETS=link-framework
-	EXTRA_LIBINST_TARGETS=install-framework
-	EXTRA_CLEAN_TARGETS=clean-framework
-	EXTRA_CLEAN_LINKS=clean-framework-link
 	;;
 
 *-*-solaris*)