projects / krb5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8265037)
fixes for srcdir, LEX tests
authorMark Eichin <eichin@mit.edu>
Wed, 15 Jun 1994 01:08:24 +0000 (01:08 +0000)
committerMark Eichin <eichin@mit.edu>
Wed, 15 Jun 1994 01:08:24 +0000 (01:08 +0000)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3791 dc483132-0cff-0310-8789-dd5450dbe970

src/include/krb5/Makefile.in patch | blob | history
src/include/krb5/configure.in patch | blob | history
src/isode/compat/Makefile.in patch | blob | history
src/isode/pepsy/Makefile.in patch | blob | history
src/isode/pepsy/configure.in patch | blob | history
src/isode/pepsy/pepsydefs.h.gnrc patch | blob | history
src/isode/psap/Makefile.in patch | blob | history
src/lib/crypto/os/Makefile.in patch | blob | history

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 4972c714e480ad9509a378ae332f2f92db519262..34c4795d5adc46965a6979171c9117bd490949ea 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -1,6 +1,9 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+
 KRB5ROOT = @KRB5ROOT@
 KDB5DIR = $(KRB5ROOT)
 KRB5SRVTABDIR = /etc
diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index cc915004efb6fd08cf19cbc14ec881f8483d8ae8..6bbe220fbff4909c964108de32617815c9f6384c 100644 (file)
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(acconfig.h)
 AC_CONFIG_HEADER(autoconf.h)
+AC_PROG_LEX
 HAVE_YYLINENO
 AC_FUNC_CHECK(strdup,AC_DEFINE(HAS_STRDUP))
 CHECK_DIRENT
diff --git a/src/isode/compat/Makefile.in b/src/isode/compat/Makefile.in
index 32599d41cd9deae9c39b20f86f91d4f401379ec8..35adc03e885a17515db8765d928fa864e86f97ed 100644 (file)
--- a/src/isode/compat/Makefile.in
+++ b/src/isode/compat/Makefile.in
@@ -16,7 +16,7 @@ ISODEINCM=    $(KRBINC)isode
 ISODEINC=      $(ISODEINCM)/
 
 HDIR   =       $(TOPDIR)isode/h/
-UTILDIR        =       $(TOPDIR)isode/util/
+UTILDIR        =       $(srcdir)/$(BUILDTOP)isode/util/
 INCDIRM        =       $(HDIR)
 INCDIR =       $(INCDIRM)/
 PEPSYDIRM=     $(INCDIR)pepsy
@@ -131,7 +131,7 @@ str2vec.o:  $(HFILES)
 tailor.o:      $(HFILES) $(HDIR)isoaddrs.h $(HDIR)tailor.h $(HDIR)logger.h 
                $(CC) $(CFLAGS) -DBINPATH=\"$(BINDIR)\" \
                        -DETCPATH=\"$(ETCDIR)\" -DSBINPATH=\"$(SBINDIR)\" \
-                       -DLOGPATH=\"$(LOGDIR)\" -c tailor.c
+                       -DLOGPATH=\"$(LOGDIR)\" -c $(srcdir)/tailor.c
 baduser.o:     $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
 chkpassword.o: $(HFILES)
 getpassword.o: $(HFILES)
diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in
index dd762142c70a9ade193e8b6fc3383e3bb1fa678c..9ffba0b8f1ecd22bf8c1a9ab409fd3148dccf172 100644 (file)
--- a/src/isode/pepsy/Makefile.in
+++ b/src/isode/pepsy/Makefile.in
@@ -12,8 +12,8 @@ TOPDIR = $(BUILDTOP)
 OPTIONS        =       -I. -I$(HDIR) -I$(TOPDIR)include $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) $(DEFS)
 
-HDIR   =       $(TOPDIR)isode/h/
-UTILDIR        =       $(TOPDIR)isode/util/
+HDIR   =       $(srcdir)/$(TOPDIR)isode/h/
+UTILDIR        =       $(srcdir)/$(BUILDTOP)isode/util/
 INCDIRM        =       $(HDIR)
 INCDIR =       $(INCDIRM)/
 PEPSYDIRM=     $(INCDIR)pepsy
@@ -29,6 +29,9 @@ ISODEINC=     $(KRBINC)isode/
 PEPSYINCM=     $(ISODEINC)pepsy
 PEPSYINC=      $(ISODEINC)pepsy/
 
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+
 LIBES  =       libcompat.a
 LLIBS   =
 LN     =       ln
@@ -50,7 +53,7 @@ PEPYPATH=     -DPEPYPATH -DPEPSYPATH=\".:$(PEPSYDIRM)\"
 # to prevent a lot of unnecessary re-loading
 PEPSYLIBES=    $(PSAPDIR)/sprintoid.o $(PSAPDIR)/pl_tables.o \
                $(PSAPDIR)/oid_cmp.o $(PSAPDIR)/oid_cpy.o \
-               $(PSAPDIR)/oid_free.o ../compat/libcompat.a
+               $(PSAPDIR)/oid_free.o ../compat/libcompat.a $(LEXLIB)
 LIBES   =      $(TOPDIR)lib/libpsap.a $(TOPDIR)lib/libcompat.a
 LLIBS   =      $(TOPDIR)lib/llib-lpsap $(TOPDIR)lib/llib-lcompat
 HFILES =       $(HDIR)psap.h \
@@ -63,7 +66,7 @@ LIBFILES=     $(DRFILES) $(SUPFILES)
 CFILES =       enc.c dec.c fre.c prnt.c main.c util.c  \
                vprint.c pepsy_str.c py_advise.c
 
-HFILES =       $(HDIR)/pepsy.h test_table.h
+HFILES =       $(TOPDIR)include/isode/pepsy.h test_table.h
 HEADERS        =       UNIV.ph UNIV-types.h
 
 OFILES =       $(LIBFILES) main.o
@@ -113,7 +116,7 @@ xpepsy:             pepsyvrsn.o $(PEPSYLIBES)
                        pepsyvrsn.o $(PEPSYLIBES) -lm
 
 pepsy.o:       pepsy.c pepsydefs.h $(HFILES)
-               $(CC) $(CFLAGS) -c pepsy.c
+               $(CC) $(CFLAGS) -c $(srcdir)/pepsy.c
 
 
 pepsyvrsn.c:   $(PEPSY-O)
@@ -131,7 +134,7 @@ pepsy-yacc.y:       yacc.y.gnrc
                $(UTILDIR)extract.sh PEPSY SCTRL < $? > $@
 
 pepsy_misc.o:  pepsy_misc.c pepsydefs.h
-               $(CC) $(CFLAGS) -c pepsy_misc.c
+               $(CC) $(CFLAGS) -c $(srcdir)/pepsy_misc.c
 
 lex.c:         lex.l
                $(LEX) $(LEXFLAGS) lex.l
@@ -146,18 +149,18 @@ pepsydefs.h:      pepsydefs.h.gnrc
 pepsy.h:       pepsy.h.gnrc
                $(UTILDIR)extract.sh PEPSY < $? > $@
 
-pass2.o:       pass2.c
-               $(CC) $(CFLAGS) -c pass2.c
-etabs.o:       etabs.c
-               $(CC) $(CFLAGS) -c etabs.c
-dtabs.o:       dtabs.c
-               $(CC) $(CFLAGS) -c dtabs.c
-ptabs.o:       ptabs.c
-               $(CC) $(CFLAGS) -c ptabs.c
-dfns.o:                dfns.c
-               $(CC) $(CFLAGS) -c dfns.c
-mod.o:         mod.c
-               $(CC) $(CFLAGS) -c mod.c
+pass2.o:       $(srcdir)/pass2.c
+               $(CC) $(CFLAGS) -c $(srcdir)/pass2.c
+etabs.o:       $(srcdir)/etabs.c
+               $(CC) $(CFLAGS) -c $(srcdir)/etabs.c
+dtabs.o:       $(srcdir)/dtabs.c
+               $(CC) $(CFLAGS) -c $(srcdir)/dtabs.c
+ptabs.o:       $(srcdir)/ptabs.c
+               $(CC) $(CFLAGS) -c $(srcdir)/ptabs.c
+dfns.o:                $(srcdir)/dfns.c
+               $(CC) $(CFLAGS) -c $(srcdir)/dfns.c
+mod.o:         $(srcdir)/mod.c
+               $(CC) $(CFLAGS) -c $(srcdir)/mod.c
 
 
 l-pepsy:       $(PEPSY-C) pepsydefs.h pepsyvrsn.c true
@@ -292,20 +295,20 @@ pep:              $(PEPFILES)
 pep-saber:     $(PEPFILES)
                #load $(CFLAGS) (PEPFILES)
 
-main.o:        T1-types.h test_table.h main.c
-               $(CC) $(CFLAGS) -DPRNT=1 -c main.c
+main.o:        T1-types.h test_table.h $(srcdir)/main.c
+               $(CC) $(CFLAGS) -DPRNT=1 -c $(srcdir)/main.c
 
 enc.o:         enc.c pepsy-driver.h
-               $(CC) $(CFLAGS) -c enc.c
+               $(CC) $(CFLAGS) -c $(srcdir)/enc.c
 
 dec.o:         dec.c pepsy-driver.h
-               $(CC) $(CFLAGS) -c dec.c
+               $(CC) $(CFLAGS) -c $(srcdir)/dec.c
 
 prnt.o:        prnt.c pepsy-driver.h
-               $(CC) $(CFLAGS) -c prnt.c
+               $(CC) $(CFLAGS) -c $(srcdir)/prnt.c
 
 util.o:        util.c pepsy-driver.h
-               $(CC) $(CFLAGS) -c util.c
+               $(CC) $(CFLAGS) -c $(srcdir)/util.c
 
 T1_tables.o:   T1_tables.c T1-types.h UNIV-types.h
 
@@ -324,8 +327,8 @@ T3_tables.o:        T3_tables.c T3-types.h UNIV-types.h
 T3_tables.c T3-types.h:        t3.py xpepsy
                ./xpepsy -A -f -m -i pepy-refs.h t3.py
 
-prt.o:         prnt.c $(HDIR)/pepsy.h
-               $(CC) $(CFLAGS) -Dprintf=vprint -o $@ prnt.c
+prt.o:         prnt.c $(TOPDIR)include/isode/pepsy.h
+               $(CC) $(CFLAGS) -Dprintf=vprint -o $@ $(srcdir)/prnt.c
 
 
 ################################################################
diff --git a/src/isode/pepsy/configure.in b/src/isode/pepsy/configure.in
index 56b3e2378393b4fc1805ac5479ae95d5aafd4746..3f73b84656637db2ef90018386202728a991166a 100644 (file)
--- a/src/isode/pepsy/configure.in
+++ b/src/isode/pepsy/configure.in
@@ -1,3 +1,5 @@
 AC_INIT(configure.in)
+AC_PROG_LEX
+AC_YYTEXT_POINTER
 HAVE_YYLINENO
 AC_OUTPUT(Makefile)
diff --git a/src/isode/pepsy/pepsydefs.h.gnrc b/src/isode/pepsy/pepsydefs.h.gnrc
index c90c0f208af9ec67cb2050fe83a240a8a5102eee..e958c2c15b8ef5d6037a769f03fd46db9d72148c 100644 (file)
--- a/src/isode/pepsy/pepsydefs.h.gnrc
+++ b/src/isode/pepsy/pepsydefs.h.gnrc
@@ -17,9 +17,12 @@
  *
  *
  * $Log$
- * Revision 1.2  1994/06/11 07:42:43  tlyu
- * fixed yytext declaration problem
+ * Revision 1.3  1994/06/15 01:08:19  eichin
+ * fixes for srcdir, LEX tests
  *
+Revision 1.2  1994/06/11 07:42:43  tlyu
+fixed yytext declaration problem
+
 Revision 1.1  1994/06/10  03:31:25  eichin
 autoconfed isode for kerberos work
 
@@ -394,7 +397,7 @@ extern char *yyprfdflt;
 extern int yydebug;
 extern int yylineno;
 
-#if defined(linux)
+#if defined(YYTEXT_POINTER)
 extern char *yytext;
 #else
 #ifndef        HPUX
diff --git a/src/isode/psap/Makefile.in b/src/isode/psap/Makefile.in
index dc1d77338f13931f9c325dd4fe40475aeea79a3c..73c43255f3d813a20114c992823ddb18a384401c 100644 (file)
--- a/src/isode/psap/Makefile.in
+++ b/src/isode/psap/Makefile.in
@@ -17,7 +17,7 @@ ISODEINCM=    $(KRBINC)isode
 ISODEINC=      $(ISODEINCM)/
 
 HDIR   =       $(TOPDIR)isode/h/
-UTILDIR        =       $(TOPDIR)isode/util/
+UTILDIR        =       $(srcdir)/$(BUILDTOP)isode/util/
 INCDIRM        =       $(HDIR)
 INCDIR =       $(INCDIRM)/
 PEPSYDIRM=     $(INCDIR)pepsy
@@ -230,10 +230,10 @@ uvec2ps.o:        $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
 psaptest:      psaptest.o $(LIBES)
                $(LDCC) $(LDFLAGS) -o $@ psaptest.o $(LIBES) $(LSOCKET)
 
-psaptest.o:    $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h psaptest.c
-               $(CC) $(CFLAGS) -c psaptest.c
+psaptest.o:    $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h $(srcdir)/psaptest.c
+               $(CC) $(CFLAGS) -c $(srcdir)/psaptest.c
 
-l-psaptest:;   $(LINT) $(LFLAGS) psaptest.c llib-lpsap $(LLIBS) \
+l-psaptest:;   $(LINT) $(LFLAGS) $(srcdir)/psaptest.c llib-lpsap $(LLIBS) \
                        | grep -v "warning: possible pointer alignment problem"
 
 
@@ -245,14 +245,14 @@ hex2pe:           hex2pe.o
                $(LDCC) $(LDFLAGS) -o $@ hex2pe.o
 
 hex2pe.o:      $(HFILES) hex2pe.c
-               $(CC) $(CFLAGS) -c hex2pe.c
+               $(CC) $(CFLAGS) -c $(srcdir)/hex2pe.c
 
 
 dec2pe:                dec2pe.o
                $(LDCC) $(LDFLAGS) -o $@ dec2pe.o
 
 dec2pe.o:      $(HFILES) dec2pe.c
-               $(CC) $(CFLAGS) -c dec2pe.c
+               $(CC) $(CFLAGS) -c $(srcdir)/dec2pe.c
 
 
 ################################################################
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 333750843455acaceb6ffcd9ec500eac57d37aa0..86ca11ee5330e16f908866fc4b0791b98ccfd642 100644 (file)
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -27,13 +27,13 @@ OBJS=       rnd_confoun.o localaddr.o ustime.o $(LIBOBJS)
 SRCS=  rnd_confoun.c localaddr.c ustime.c 
 
 localaddr.c: ../../krb5/os/localaddr.c
-       $(LN) ../../krb5/os/localaddr.c $@
+       -$(LN) $(srcdir)/../../krb5/os/localaddr.c $@
 
 ustime.c: ../../krb5/os/ustime.c
-       $(LN) ../../krb5/os/ustime.c $@
+       -$(LN) $(srcdir)/../../krb5/os/ustime.c $@
 
 memmove.c: ../../krb5/posix/memmove.c
-       $(LN) ../../krb5/posix/memmove.c $@
+       -$(LN) $(srcdir)/../../krb5/posix/memmove.c $@
 
 
 
MIT implementation of the Kerberos network authentication protocol. This repo may be rebased, so don't base your work on it. Use git://github.com/krb5/krb5 instead.