aboutsummaryrefslogtreecommitdiff
path: root/src/clients/kpasswd
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>1999-12-15 02:09:32 +0000
committerKen Raeburn <raeburn@mit.edu>1999-12-15 02:09:32 +0000
commitdde0a3d9c818cf3da50cbd52b3f6faf772360e4b (patch)
tree496edc87ecead3d07c78717ead02942fe488f292 /src/clients/kpasswd
parent1c30f947f416fdcb0c390aca784741c0bd10bda3 (diff)
downloadkrb5-dde0a3d9c818cf3da50cbd52b3f6faf772360e4b.zip
krb5-dde0a3d9c818cf3da50cbd52b3f6faf772360e4b.tar.gz
krb5-dde0a3d9c818cf3da50cbd52b3f6faf772360e4b.tar.bz2
1.1 branch changes -> trunk
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11954 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/clients/kpasswd')
-rw-r--r--src/clients/kpasswd/ChangeLog4
-rw-r--r--src/clients/kpasswd/Makefile.in11
2 files changed, 7 insertions, 8 deletions
diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog
index a7993d4..ba06e70 100644
--- a/src/clients/kpasswd/ChangeLog
+++ b/src/clients/kpasswd/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-03 Danilo Almeida <dalmeida@mit.edu>
+
+ * Makefile.in: Windows fix for 10/26/99 cleanup.
+
1999-10-26 Tom Yu <tlyu@mit.edu>
* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index 4aae2e0..a9fed31 100644
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -5,8 +5,6 @@ BUILDTOP=$(REL)$(U)$(S)$(U)
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-##DOSBUILDTOP=..\..
-
kpasswd: kpasswd.o $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o kpasswd kpasswd.o $(KRB5_BASE_LIBS)
@@ -21,10 +19,7 @@ install-all install-kdc install-server install-client install-unix::
$(INSTALL_PROGRAM) kpasswd $(DESTDIR)$(CLIENT_BINDIR)/`echo kpasswd|sed '$(transform)'`
$(INSTALL_DATA) $(srcdir)/kpasswd.M $(DESTDIR)$(CLIENT_MANDIR)/`echo kpasswd|sed '$(transform)'`.1;
-##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS = $(CCOPTS2)
-##WIN32##CPPFLAGS = $(INCLUDES)
+all-windows:: $(OUTPRE)kpasswd.exe
-##WIN32##all-windows:: $(OUTPRE)kpasswd.exe
-##WIN32##$(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB)
-##WIN32## link $(LINKOPTS2) -out:$@ $**
+$(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB)
+ link $(EXE_LINKOPTS) -out:$@ $**