From ed186a4c93cd39105f8beca99c4aee37a8384a5e Mon Sep 17 00:00:00 2001
From: Mark Eichin <eichin@mit.edu>
Date: Fri, 1 Jul 1994 16:59:13 +0000
Subject: rename *.in.* to *.*.in to make it work

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3936 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/krb5/asn.1/Makefile.in.isode | 173 -----------------------------------
 src/lib/krb5/asn.1/Makefile.in.sane  |  63 -------------
 src/lib/krb5/asn.1/Makefile.isode.in | 173 +++++++++++++++++++++++++++++++++++
 src/lib/krb5/asn.1/Makefile.sane.in  |  63 +++++++++++++
 src/lib/krb5/asn.1/configure.in      |  15 +--
 5 files changed, 245 insertions(+), 242 deletions(-)
 delete mode 100644 src/lib/krb5/asn.1/Makefile.in.isode
 delete mode 100644 src/lib/krb5/asn.1/Makefile.in.sane
 create mode 100644 src/lib/krb5/asn.1/Makefile.isode.in
 create mode 100644 src/lib/krb5/asn.1/Makefile.sane.in

(limited to 'src')

diff --git a/src/lib/krb5/asn.1/Makefile.in.isode b/src/lib/krb5/asn.1/Makefile.in.isode
deleted file mode 100644
index e4009b1df..000000000
--- a/src/lib/krb5/asn.1/Makefile.in.isode
+++ /dev/null
@@ -1,173 +0,0 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
-# -I. for isode/
-CFLAGS = $(CCOPTS) $(DEFS) -DPEPSY_LINKABLE_FUNCS -I.
-LDFLAGS = -g
-
-RM = rm -f
-CP = cp
-
-
-PEPSY = @PEPSY@
-PSYFLAGS = @PSYFLAGS@
-
-KRB5ROOT = @KRB5ROOT@
-
-KRB5_INCDIR = $(KRB5ROOT)/include
-
-all::
-
-SRCTOP=$(srcdir)/$(BUILDTOP)
-
-EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
-
-SRCS= \
-	KRB5_tables.c	\
-	$(srcdir)/encode.c 	\
-	$(srcdir)/decode.c	\
-	$(srcdir)/adat2kadat.c	\
-	$(srcdir)/addr2kaddr.c	\
-	$(srcdir)/adr2kadr.c	\
-	$(srcdir)/aprp2kaprp.c	\
-	$(srcdir)/aprq2kaprq.c	\
-	$(srcdir)/arep2karep.c	\
-	$(srcdir)/auth2kauth.c	\
-	$(srcdir)/cvt_flags.c	\
-	$(srcdir)/ck2kck.c	\
-	$(srcdir)/edat2kedat.c	\
-	$(srcdir)/ekrp2kekrp.c	\
-	$(srcdir)/enck2kkey.c	\
-	$(srcdir)/err2kerr.c	\
-	$(srcdir)/etpt2ketpt.c	\
-	$(srcdir)/g2unix.c	\
-	$(srcdir)/kadat2adat.c	\
-	$(srcdir)/kaddr2addr.c	\
-	$(srcdir)/kadr2adr.c	\
-	$(srcdir)/kaprp2aprp.c	\
-	$(srcdir)/kaprq2aprq.c	\
-	$(srcdir)/karep2arep.c	\
-	$(srcdir)/kauth2auth.c	\
-	$(srcdir)/kck2ck.c	\
-	$(srcdir)/kdcr2kkdcr.c	\
-	$(srcdir)/kdcr2ktgsr.c	\
-	$(srcdir)/kedat2edat.c	\
-	$(srcdir)/kekrp2ekrp.c	\
-	$(srcdir)/kerr2err.c	\
-	$(srcdir)/ketpt2etpt.c	\
-	$(srcdir)/kkdcr2kdcr.c	\
-	$(srcdir)/kkey2enck.c	\
-	$(srcdir)/klsrq2lsrq.c	\
-	$(srcdir)/kprep2prep.c	\
-	$(srcdir)/kprin2prin.c	\
-	$(srcdir)/kpriv2priv.c	\
-	$(srcdir)/ksafe2safe.c	\
-	$(srcdir)/ktran2tran.c	\
-	$(srcdir)/ktgrq2tgrq.c	\
-	$(srcdir)/ktgsr2kdcr.c	\
-	$(srcdir)/ktkt2tkt.c	\
-	$(srcdir)/lsrq2klsrq.c	\
-	$(srcdir)/prep2kprep.c	\
-	$(srcdir)/prin2kprin.c	\
-	$(srcdir)/priv2kpriv.c	\
-	$(srcdir)/qbuf2data.c	\
-	$(srcdir)/safe2ksafe.c	\
-	$(srcdir)/tran2ktran.c	\
-	$(srcdir)/tgrq2ktgrq.c	\
-	$(srcdir)/tkt2ktkt.c	\
-	$(srcdir)/u2gen.c 	\
-	$(srcdir)/ktgsr2kdcr.c	\
-	$(srcdir)/kpwd2pwd.c	\
-	$(srcdir)/kpwds2pwds.c	\
-	$(srcdir)/pwd2kpwd.c	\
-	$(srcdir)/pwds2kpwds.c	\
-	$(srcdir)/cred2kcred.c	\
-	$(srcdir)/crep2kcrep.c	\
-	$(srcdir)/kcred2cred.c	\
-	$(srcdir)/kcrep2crep.c
-
-OBJS= \
-	KRB5_tables.o	\
-	encode.o	\
-	decode.o	\
-	adat2kadat.o	\
-	addr2kaddr.o	\
-	adr2kadr.o	\
-	aprp2kaprp.o	\
-	aprq2kaprq.o	\
-	arep2karep.o	\
-	auth2kauth.o	\
-	cvt_flags.o	\
-	ck2kck.o	\
-	edat2kedat.o	\
-	ekrp2kekrp.o	\
-	enck2kkey.o	\
-	err2kerr.o	\
-	etpt2ketpt.o	\
-	g2unix.o	\
-	kadat2adat.o	\
-	kaddr2addr.o	\
-	kadr2adr.o	\
-	kaprp2aprp.o	\
-	kaprq2aprq.o	\
-	karep2arep.o	\
-	kauth2auth.o	\
-	kck2ck.o	\
-	kdcr2kkdcr.o	\
-	kdcr2ktgsr.o	\
-	kedat2edat.o	\
-	kekrp2ekrp.o	\
-	kerr2err.o	\
-	ketpt2etpt.o	\
-	kkdcr2kdcr.o	\
-	kkey2enck.o	\
-	klsrq2lsrq.o	\
-	kprep2prep.o	\
-	kprin2prin.o	\
-	kpriv2priv.o	\
-	ksafe2safe.o	\
-	ktran2tran.o	\
-	ktgrq2tgrq.o	\
-	ktgsr2kdcr.o	\
-	ktkt2tkt.o	\
-	lsrq2klsrq.o	\
-	prep2kprep.o	\
-	prin2kprin.o	\
-	priv2kpriv.o	\
-	qbuf2data.o	\
-	safe2ksafe.o	\
-	tran2ktran.o	\
-	tgrq2ktgrq.o	\
-	tkt2ktkt.o	\
-	u2gen.o		\
-	kpwd2pwd.o	\
-	kpwds2pwds.o	\
-	pwd2kpwd.o	\
-	pwds2kpwds.o	\
-	cred2kcred.o	\
-	crep2kcrep.o	\
-	kcred2cred.o	\
-	kcrep2crep.o
-
-all:: includes
-
-includes:: KRB5-types.h
-
-clean::
-	$(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
-
-KRB5_tables.o: KRB5_tables.c
-
-
-depend:: KRB5_tables.c
-
-
-clean::
-	$(RM) $(OBJS)
-
diff --git a/src/lib/krb5/asn.1/Makefile.in.sane b/src/lib/krb5/asn.1/Makefile.in.sane
deleted file mode 100644
index 63d043fa0..000000000
--- a/src/lib/krb5/asn.1/Makefile.in.sane
+++ /dev/null
@@ -1,63 +0,0 @@
-BUILDTOP=@BUILDTOP@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-DEFS = @DEFS@
-CC = @CC@
-CCOPTS = @CCOPTS@
-LIBS = @LIBS@
- 
-CFLAGS=$(CCOPTS) $(DEFS)
-LDFLAGS = -g
-
-RM = rm -f
-CP = cp
-
-
-PEPSY = @PEPSY@
-PSYFLAGS = @PSYFLAGS@
-
-KRB5ROOT = @KRB5ROOT@
-
-KRB5_INCDIR = $(KRB5ROOT)/include
-
-all::
-
-SRCTOP=$(srcdir)/$(BUILDTOP)
-
-EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
-
-SRCS= \
-	$(srcdir)asn1_decode.c\
-	$(srcdir)asn1_decode_k.c\
-	$(srcdir)asn1_encode.c\
-	$(srcdir)asn1_get.c\
-	$(srcdir)asn1_make.c\
-	$(srcdir)asn1buf.c\
-	$(srcdir)krb5_decode.c\
-	$(srcdir)krb5_encode.c\
-	$(srcdir)asn1_encode_k.c\
-	$(srcdir)asn1_misc.c
-
-OBJS= \
-	asn1_decode.o\
-	asn1_decode_k.o\
-	asn1_encode.o\
-	asn1_get.o\
-	asn1_make.o\
-	asn1buf.o\
-	krb5_decode.o\
-	krb5_encode.o\
-	asn1_encode_k.o\
-	asn1_misc.o
-
-all:: includes
-
-clean::
-	$(RM) $(OBJS)
-
-KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c::
-	echo '/* isode sucks */' > $@
-
-clean::
-	$(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
diff --git a/src/lib/krb5/asn.1/Makefile.isode.in b/src/lib/krb5/asn.1/Makefile.isode.in
new file mode 100644
index 000000000..e4009b1df
--- /dev/null
+++ b/src/lib/krb5/asn.1/Makefile.isode.in
@@ -0,0 +1,173 @@
+BUILDTOP=@BUILDTOP@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+DEFS = @DEFS@
+CC = @CC@
+CCOPTS = @CCOPTS@
+LIBS = @LIBS@
+ 
+# -I. for isode/
+CFLAGS = $(CCOPTS) $(DEFS) -DPEPSY_LINKABLE_FUNCS -I.
+LDFLAGS = -g
+
+RM = rm -f
+CP = cp
+
+
+PEPSY = @PEPSY@
+PSYFLAGS = @PSYFLAGS@
+
+KRB5ROOT = @KRB5ROOT@
+
+KRB5_INCDIR = $(KRB5ROOT)/include
+
+all::
+
+SRCTOP=$(srcdir)/$(BUILDTOP)
+
+EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
+
+SRCS= \
+	KRB5_tables.c	\
+	$(srcdir)/encode.c 	\
+	$(srcdir)/decode.c	\
+	$(srcdir)/adat2kadat.c	\
+	$(srcdir)/addr2kaddr.c	\
+	$(srcdir)/adr2kadr.c	\
+	$(srcdir)/aprp2kaprp.c	\
+	$(srcdir)/aprq2kaprq.c	\
+	$(srcdir)/arep2karep.c	\
+	$(srcdir)/auth2kauth.c	\
+	$(srcdir)/cvt_flags.c	\
+	$(srcdir)/ck2kck.c	\
+	$(srcdir)/edat2kedat.c	\
+	$(srcdir)/ekrp2kekrp.c	\
+	$(srcdir)/enck2kkey.c	\
+	$(srcdir)/err2kerr.c	\
+	$(srcdir)/etpt2ketpt.c	\
+	$(srcdir)/g2unix.c	\
+	$(srcdir)/kadat2adat.c	\
+	$(srcdir)/kaddr2addr.c	\
+	$(srcdir)/kadr2adr.c	\
+	$(srcdir)/kaprp2aprp.c	\
+	$(srcdir)/kaprq2aprq.c	\
+	$(srcdir)/karep2arep.c	\
+	$(srcdir)/kauth2auth.c	\
+	$(srcdir)/kck2ck.c	\
+	$(srcdir)/kdcr2kkdcr.c	\
+	$(srcdir)/kdcr2ktgsr.c	\
+	$(srcdir)/kedat2edat.c	\
+	$(srcdir)/kekrp2ekrp.c	\
+	$(srcdir)/kerr2err.c	\
+	$(srcdir)/ketpt2etpt.c	\
+	$(srcdir)/kkdcr2kdcr.c	\
+	$(srcdir)/kkey2enck.c	\
+	$(srcdir)/klsrq2lsrq.c	\
+	$(srcdir)/kprep2prep.c	\
+	$(srcdir)/kprin2prin.c	\
+	$(srcdir)/kpriv2priv.c	\
+	$(srcdir)/ksafe2safe.c	\
+	$(srcdir)/ktran2tran.c	\
+	$(srcdir)/ktgrq2tgrq.c	\
+	$(srcdir)/ktgsr2kdcr.c	\
+	$(srcdir)/ktkt2tkt.c	\
+	$(srcdir)/lsrq2klsrq.c	\
+	$(srcdir)/prep2kprep.c	\
+	$(srcdir)/prin2kprin.c	\
+	$(srcdir)/priv2kpriv.c	\
+	$(srcdir)/qbuf2data.c	\
+	$(srcdir)/safe2ksafe.c	\
+	$(srcdir)/tran2ktran.c	\
+	$(srcdir)/tgrq2ktgrq.c	\
+	$(srcdir)/tkt2ktkt.c	\
+	$(srcdir)/u2gen.c 	\
+	$(srcdir)/ktgsr2kdcr.c	\
+	$(srcdir)/kpwd2pwd.c	\
+	$(srcdir)/kpwds2pwds.c	\
+	$(srcdir)/pwd2kpwd.c	\
+	$(srcdir)/pwds2kpwds.c	\
+	$(srcdir)/cred2kcred.c	\
+	$(srcdir)/crep2kcrep.c	\
+	$(srcdir)/kcred2cred.c	\
+	$(srcdir)/kcrep2crep.c
+
+OBJS= \
+	KRB5_tables.o	\
+	encode.o	\
+	decode.o	\
+	adat2kadat.o	\
+	addr2kaddr.o	\
+	adr2kadr.o	\
+	aprp2kaprp.o	\
+	aprq2kaprq.o	\
+	arep2karep.o	\
+	auth2kauth.o	\
+	cvt_flags.o	\
+	ck2kck.o	\
+	edat2kedat.o	\
+	ekrp2kekrp.o	\
+	enck2kkey.o	\
+	err2kerr.o	\
+	etpt2ketpt.o	\
+	g2unix.o	\
+	kadat2adat.o	\
+	kaddr2addr.o	\
+	kadr2adr.o	\
+	kaprp2aprp.o	\
+	kaprq2aprq.o	\
+	karep2arep.o	\
+	kauth2auth.o	\
+	kck2ck.o	\
+	kdcr2kkdcr.o	\
+	kdcr2ktgsr.o	\
+	kedat2edat.o	\
+	kekrp2ekrp.o	\
+	kerr2err.o	\
+	ketpt2etpt.o	\
+	kkdcr2kdcr.o	\
+	kkey2enck.o	\
+	klsrq2lsrq.o	\
+	kprep2prep.o	\
+	kprin2prin.o	\
+	kpriv2priv.o	\
+	ksafe2safe.o	\
+	ktran2tran.o	\
+	ktgrq2tgrq.o	\
+	ktgsr2kdcr.o	\
+	ktkt2tkt.o	\
+	lsrq2klsrq.o	\
+	prep2kprep.o	\
+	prin2kprin.o	\
+	priv2kpriv.o	\
+	qbuf2data.o	\
+	safe2ksafe.o	\
+	tran2ktran.o	\
+	tgrq2ktgrq.o	\
+	tkt2ktkt.o	\
+	u2gen.o		\
+	kpwd2pwd.o	\
+	kpwds2pwds.o	\
+	pwd2kpwd.o	\
+	pwds2kpwds.o	\
+	cred2kcred.o	\
+	crep2kcrep.o	\
+	kcred2cred.o	\
+	kcrep2crep.o
+
+all:: includes
+
+includes:: KRB5-types.h
+
+clean::
+	$(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
+
+KRB5_tables.o: KRB5_tables.c
+
+
+depend:: KRB5_tables.c
+
+
+clean::
+	$(RM) $(OBJS)
+
diff --git a/src/lib/krb5/asn.1/Makefile.sane.in b/src/lib/krb5/asn.1/Makefile.sane.in
new file mode 100644
index 000000000..63d043fa0
--- /dev/null
+++ b/src/lib/krb5/asn.1/Makefile.sane.in
@@ -0,0 +1,63 @@
+BUILDTOP=@BUILDTOP@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+DEFS = @DEFS@
+CC = @CC@
+CCOPTS = @CCOPTS@
+LIBS = @LIBS@
+ 
+CFLAGS=$(CCOPTS) $(DEFS)
+LDFLAGS = -g
+
+RM = rm -f
+CP = cp
+
+
+PEPSY = @PEPSY@
+PSYFLAGS = @PSYFLAGS@
+
+KRB5ROOT = @KRB5ROOT@
+
+KRB5_INCDIR = $(KRB5ROOT)/include
+
+all::
+
+SRCTOP=$(srcdir)/$(BUILDTOP)
+
+EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
+
+SRCS= \
+	$(srcdir)asn1_decode.c\
+	$(srcdir)asn1_decode_k.c\
+	$(srcdir)asn1_encode.c\
+	$(srcdir)asn1_get.c\
+	$(srcdir)asn1_make.c\
+	$(srcdir)asn1buf.c\
+	$(srcdir)krb5_decode.c\
+	$(srcdir)krb5_encode.c\
+	$(srcdir)asn1_encode_k.c\
+	$(srcdir)asn1_misc.c
+
+OBJS= \
+	asn1_decode.o\
+	asn1_decode_k.o\
+	asn1_encode.o\
+	asn1_get.o\
+	asn1_make.o\
+	asn1buf.o\
+	krb5_decode.o\
+	krb5_encode.o\
+	asn1_encode_k.o\
+	asn1_misc.o
+
+all:: includes
+
+clean::
+	$(RM) $(OBJS)
+
+KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c::
+	echo '/* isode sucks */' > $@
+
+clean::
+	$(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in
index 13c826a00..23e19a34b 100644
--- a/src/lib/krb5/asn.1/configure.in
+++ b/src/lib/krb5/asn.1/configure.in
@@ -1,17 +1,20 @@
 AC_INIT(configure.in)
 WITH_CCOPTS
-CONFIG_RULES
+WITH_CC dnl since we're not doing CONFIG_RULES
+dnl CONFIG_RULES
 AC_SET_BUILDTOP
 SubdirLibraryRule([${OBJS}])
 AC_ENABLE([isode],[
 UsePepsy
 PepsyTarget(KRB5)
-cp ${srcdir}/Makefile.in.isode Makefile.in],[
+ISODEMAKEFILE=Makefile.isode],[
+ISODEMAKEFILE=Makefile.sane
 PEPSY='@echo'
 PSYFLAGS='not using pepsy'
 AC_SUBST(PEPSY)dnl
 AC_SUBST(PSYFLAGS)dnl
-cp ${srcdir}/Makefile.in.sane Makefile.in])
+])
+AC_SUBST(ISODEMAKEFILE)
 CopyHeader(KRB5-types.h,[$(EHDRDIR)])
 CopyHeader(KRB5_defs.h,[$(EHDRDIR)])
 CopyHeader(KRB5_pre_defs.h,[$(EHDRDIR)])
@@ -20,10 +23,10 @@ dnl
 dnl ok this is broken but necessary because we're using autoconf
 dnl ...and we can't conditionalize the generation of make rules
 dnl
-CopyHeader(krb5_encode.h,[$(EHDRDIR)])
-CopyHeader(krb5_decode.h,[$(EHDRDIR)])
+CopySrcHeader(krb5_encode.h,[$(EHDRDIR)])
+CopySrcHeader(krb5_decode.h,[$(EHDRDIR)])
 Krb5InstallHeaders(krb5_encode.h krb5_decode.h, [$(KRB5_INCDIR)/krb5/asn.1])
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT
-AC_OUTPUT(Makefile,[EXTRA_RULES])
+AC_OUTPUT(Makefile Makefile.isode Makefile.sane,[EXTRA_RULES_IN($ISODEMAKEFILE)])
-- 
cgit