From: Theodore Tso <tytso@mit.edu>
Date: Tue, 2 Apr 1996 20:21:30 +0000 (+0000)
Subject: Makefile.in (SRCS): Inlined list of source files for SRCS and OBJS
X-Git-Tag: krb5-1.0-beta6~264
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a61985ab022b92ba39bf99bb6c64c7cf01dc203;p=krb5.git

Makefile.in (SRCS): Inlined list of source files for SRCS and OBJS
	(for Macintosh build).

k5mech.c: Added Macintosh #ifdef so that the #include path is right
	for the Macintosh.

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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index ba87cba3d..bfed88621 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr  2 15:20:24 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in (SRCS): Inlined list of source files for SRCS and
+		OBJS (for Macintosh build).
+
+	* k5mech.c: Added Macintosh #ifdef so that the #include path is
+		right for the Macintosh.
+
 Wed Mar 20 20:25:53 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* rel_oid.c (krb5_gss_release_oid): Don't compile this procedure,
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 2cc9f8733..854e89ae6 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -33,7 +33,7 @@ gssapi_err_krb5.h: gssapi_err_krb5.et
 
 gssapi_err_krb5.c: gssapi_err_krb5.et
 
-CCSRCS = \
+SRCS = \
 	$(srcdir)/accept_sec_context.c \
 	$(srcdir)/acquire_cred.c \
 	$(srcdir)/compare_name.c \
@@ -67,9 +67,10 @@ CCSRCS = \
 	$(srcdir)/util_crypt.c \
 	$(srcdir)/util_seed.c \
 	$(srcdir)/util_seqnum.c \
-	$(srcdir)/verify.c
+	$(srcdir)/verify.c \
+	gssapi_err_krb5.c
 
-CCOBJS = \
+OBJS = \
 	accept_sec_context.$(OBJEXT) \
 	acquire_cred.$(OBJEXT) \
 	compare_name.$(OBJEXT) \
@@ -103,10 +104,9 @@ CCOBJS = \
 	util_crypt.$(OBJEXT) \
 	util_seed.$(OBJEXT) \
 	util_seqnum.$(OBJEXT) \
-	verify.$(OBJEXT)
+	verify.$(OBJEXT) \
+	gssapi_err_krb5.$(OBJEXT)
 
-SRCS= $(ETSRCS) $(CCSRCS)
-OBJS= $(ETOBJS) $(CCOBJS)
 HDRS= $(ETHDRS)
 
 EHDRDIR=$(TOP)/include/gssapi
diff --git a/src/lib/gssapi/krb5/k5mech.c b/src/lib/gssapi/krb5/k5mech.c
index 7de0a1930..11a8ea492 100644
--- a/src/lib/gssapi/krb5/k5mech.c
+++ b/src/lib/gssapi/krb5/k5mech.c
@@ -8,7 +8,11 @@
  * structure, so I hide it in a non-published header.  Thats ok,
  * we know where to find it.
  */
+#if defined(__MWERKS__) || defined(applec) || defined(THINK_C)
+#include "mglueP.h"
+#else
 #include "../mechglue/mglueP.h"
+#endif
 
 #include "gssapiP_krb5.h"
 /*