diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2001-09-28 22:20:46 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2001-09-28 22:20:46 +0000 |
| commit | 164eb786c48c797647b07a007149fd379a242334 (patch) | |
| tree | cd8d2306e9b1b8b2d4110bbd1387ff8b85eeb915 /src | |
| parent | eaff8fc6a486fa10634d921b591b501a5dbe9ce4 (diff) | |
| download | krb5-164eb786c48c797647b07a007149fd379a242334.tar.gz krb5-164eb786c48c797647b07a007149fd379a242334.tar.xz krb5-164eb786c48c797647b07a007149fd379a242334.zip | |
add ##WIN32## prefix to last change, so unix build works
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13761 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/krb524/ChangeLog | 6 | ||||
| -rw-r--r-- | src/krb524/Makefile.in | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 9430325ed6..5cf270e471 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,9 @@ +2001-09-28 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in: Put "##WIN32##" prefix on lines added in last + change, otherwise UNIX Make complains about STLIBOBJS referencing + itself. + 2001-09-28 Danilo Almeida <dalmeida@mit.edu> * Makefile.in: Add KRB524_STATIC_HACK for Windows build so that we diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index 3bc0a88ae1..6fb21298f6 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -77,15 +77,15 @@ STLIBOBJS = \ $(OUTPRE)libinit.$(OBJEXT) ##WIN32##!ifdef KRB524_STATIC_HACK -LPREFIX=..\lib -K5_GLUE=$(LPREFIX)\$(OUTPRE)k5_glue.obj -KLIBS = $(LPREFIX)\krb5\$(OUTPRE)krb5.lib \ - $(LPREFIX)\crypto\$(OUTPRE)crypto.lib \ - $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \ - $(LPREFIX)\des425\$(OUTPRE)des425.lib -KLIB=$(KLIBS) $(DNSLIBS) $(K5_GLUE) $(CLIB) -STLIBOBJS=$(STLIBOBJS:libinit=globals) -K524DEP=$(STLIBOBJS) +##WIN32##LPREFIX=..\lib +##WIN32##K5_GLUE=$(LPREFIX)\$(OUTPRE)k5_glue.obj +##WIN32##KLIBS = $(LPREFIX)\krb5\$(OUTPRE)krb5.lib \ +##WIN32## $(LPREFIX)\crypto\$(OUTPRE)crypto.lib \ +##WIN32## $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \ +##WIN32## $(LPREFIX)\des425\$(OUTPRE)des425.lib +##WIN32##KLIB=$(KLIBS) $(DNSLIBS) $(K5_GLUE) $(CLIB) +##WIN32##STLIBOBJS=$(STLIBOBJS:libinit=globals) +##WIN32##K524DEP=$(STLIBOBJS) ##WIN32##!endif GENS = krb524_err.c krb524_err.h |