summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2003-12-13 01:20:56 +0000
committerTom Yu <tlyu@mit.edu>2003-12-13 01:20:56 +0000
commit733ff48aa8dfa7882ce57449a994739ff2dc8315 (patch)
tree00f2d9546bf226291ffc2fa6a8b004c7fb4ef959 /src
parent1024cce992605494dec0566a963efb1bdc0ff1d5 (diff)
downloadkrb5-733ff48aa8dfa7882ce57449a994739ff2dc8315.tar.gz
krb5-733ff48aa8dfa7882ce57449a994739ff2dc8315.tar.xz
krb5-733ff48aa8dfa7882ce57449a994739ff2dc8315.zip
* Makefile.in: Move ##WIN32## constructs from inside
backslash-continued lists, as it was breaking them. Move explicit dependency information from under automatic dependencies. ticket: 2049 component: krb5-libs git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15894 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/ccache/ChangeLog6
-rw-r--r--src/lib/krb5/ccache/Makefile.in15
2 files changed, 12 insertions, 9 deletions
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index d8a5ec94e..44b74930e 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-12 Tom Yu <tlyu@mit.edu>
+
+ * Makefile.in: Move ##WIN32## constructs from inside
+ backslash-continued lists, as it was breaking them. Move explicit
+ dependency information from under automatic dependencies.
+
2003-12-11 Jeffrey Altman <jaltman@mit.edu>
* Makefile.in, ccbase.c, cc_mslsa.c (new)
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 6b3e4a441..8e6d0f2ed 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -16,6 +16,9 @@ LOCALINCLUDES = -I$(srcdir)$(S)ccapi $(WIN_INCLUDES)
##DOS##PREFIXDIR=ccache
##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst
+##WIN32## MSLSA_OBJ = $(OUTPRE)cc_mslsa.$(OBJEXT)
+##WIN32## MSLSA_SRC = $(srcdir)/cc_mslsa.c
+
MAC_SUBDIRS = ccapi
STLIBOBJS= \
@@ -25,7 +28,6 @@ STLIBOBJS= \
ccdefops.o \
cc_retr.o \
cc_file.o cc_memory.o \
-##WIN32## cc_mslsa.c \
ccfns.o \
ser_cc.o
@@ -36,9 +38,8 @@ OBJS= $(OUTPRE)ccbase.$(OBJEXT) \
$(OUTPRE)cc_retr.$(OBJEXT) \
$(OUTPRE)cc_file.$(OBJEXT) \
$(OUTPRE)cc_memory.$(OBJEXT) \
-##WIN32## $(OUTPRE)cc_mslsa.$(OBJEXT) \
$(OUTPRE)ccfns.$(OBJEXT) \
- $(OUTPRE)ser_cc.$(OBJEXT)
+ $(OUTPRE)ser_cc.$(OBJEXT) $(MSLSA_OBJ)
SRCS= $(srcdir)/ccbase.c \
$(srcdir)/cccopy.c \
@@ -47,9 +48,8 @@ SRCS= $(srcdir)/ccbase.c \
$(srcdir)/cc_retr.c \
$(srcdir)/cc_file.c \
$(srcdir)/cc_memory.c \
-##WIN32## $(srcdir)cc_mslsa.c \
$(srcdir)/ccfns.c \
- $(srcdir)/ser_cc.c
+ $(srcdir)/ser_cc.c $(MSLSA_SRC)
##DOS##OBJS=$(OBJS) $(OUTPRE)ccfns.$(OBJEXT)
@@ -98,7 +98,7 @@ check-unix:: t_cc
clean-unix::
$(RM) t_cc t_cc.o
-
+##WIN32## $(OUTPRE)cc_mslsa.$(OBJEXT): cc_mslsa.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS)
# @libobj_frag@
@@ -142,9 +142,6 @@ cc_memory.so cc_memory.po $(OUTPRE)cc_memory.$(OBJEXT): cc_memory.c $(SRCTOP)/in
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
$(SRCTOP)/include/krb5/kdb.h
-##WIN32##cc_mslsa.so cc_mslsa.po $(OUTPRE)cc_mslsa.$(OBJEXT): cc_mslsa.c $(SRCTOP)/include/k5-int.h \
-##WIN32## $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
-##WIN32## $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS)
ccfns.so ccfns.po $(OUTPRE)ccfns.$(OBJEXT): ccfns.c $(SRCTOP)/include/k5-int.h \
$(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \