* Makefile.in: Fix build so we don't try to build an extra lib.

Fix up krb524 build so we default to krb5's krb4 but can use an
alternate.

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

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 097cb7f42f8fb85d2696045dc94df55bbce904f6..1cb90f42a11af53731c68edb27e46761466d1b87 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-20  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Fix build so we don't try to build an extra lib.
+       Fix up krb524 build so we default to krb5's krb4 but can use an
+       alternate.
+
 2000-07-19  Danilo Almeida  <dalmeida@mit.edu>
 
        * Makefile.in: Make krb524 library and k524init program build on

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index ebac8d5876db65781545635c5e7c845eecec0b6b..c6bf0cc5c5484790636f08c6af8fa62294209580 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -23,9 +23,8 @@ BUILDTOP=$(REL)$(U)
 # PERFORMANCE OF THIS SOFTWARE.
 # 
 
-LIBNAME=krb524
 ##WIN32##!if 0
-LIB=$(LIBNAME)
+LIB=krb524
 ##WIN32##!endif
 LIBMAJOR=1
 LIBMINOR=0
@@ -38,10 +37,14 @@ PROG_RPATH=$(KRB5_LIBDIR)
 KRB524_DEPLIB  = libkrb524.a
 KRB524_LIB     = libkrb524.a
 
+##WIN32##!ifdef USE_ALTERNATE_KRB4_INCLUDES
+##WIN32##KRB4_INCLUDES=-I$(USE_ALTERNATE_KRB4_INCLUDES)
+##WIN32##!endif
+
+##WIN32##!ifdef USE_ALTERNATE_KRB4_LIB
+##WIN32##K4LIB=$(USE_ALTERNATE_KRB4_LIB)
+##WIN32##!endif
 
-##WIN32##KRB4_INCLUDES = -I../../../krb4/krbv4/include -I../../../krb4/include
-##WIN32##K4LIB = ../../../krb4/krbv4/krbdll/$(OUTPRE)krbv4w32.lib
-###WIN32##K4LIB = ../lib/$(OUTPRE)krb4_32.lib
 K524DEF = krb524.def
 WINLIBS = kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib \
        version.lib advapi32.lib gdi32.lib
@@ -78,7 +81,7 @@ all-unix:: all-libs
 
 all-unix:: krb524d krb524test k524init
 
-all-windows:: $(OUTPRE)$(LIBNAME).lib $(OUTPRE)k524init.exe
+all-windows:: $(OUTPRE)krb524.lib $(OUTPRE)k524init.exe
 
 krb524test: libkrb524.a test.o $(KRB524_DEPLIB) $(KRB4COMPAT_DEPLIBS)
        $(CC_LINK) -o krb524test test.o $(KRB524_LIB) $(KRB4COMPAT_LIBS)
@@ -89,7 +92,7 @@ krb524d: krb524d.o $(KADMSRV_DEPLIBS) $(KRB524_DEPLIB) $(KRB4COMPAT_DEPLIBS)
 k524init: k524init.o  $(KRB524_DEPLIB) $(KRB4COMPAT_DEPLIBS)
        $(CC_LINK) -o k524init k524init.o $(KRB524_LIB) $(KRB4COMPAT_LIBS)
 
-$(OUTPRE)$(LIBNAME).lib: $(STLIBOBJS) $(K4LIB) $(KLIB)
+$(OUTPRE)krb524.lib: $(STLIBOBJS) $(K4LIB) $(KLIB)
        link $(DLL_LINKOPTS) -def:$(K524DEF) -out:$*.dll $** $(WINLIBS)
 
 $(OUTPRE)k524init.exe: $(OUTPRE)k524init.$(OBJEXT) $(KLIB) $(K4LIB) $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib