From cc553f28a913662b992d28150a5afe3ecdf86feb Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sun, 23 Mar 1997 13:05:18 +0000 Subject: [PATCH] moved version.h and config.h to include git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1497 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/Makefile.in | 2 +- appl/ftp/common/Makefile.in | 4 ++-- appl/ftp/ftp/Makefile.in | 2 +- appl/ftp/ftpd/Makefile.in | 2 +- appl/kx/Makefile.in | 4 ++-- appl/otp/Makefile.in | 4 ++-- appl/popper/Makefile.in | 4 ++-- appl/telnet/Makefile.in | 2 +- appl/telnet/libtelnet/Makefile.in | 6 +++--- appl/telnet/telnet/Makefile.in | 2 +- appl/telnet/telnetd/Makefile.in | 2 +- appl/xnlock/Makefile.in | 4 ++-- lib/auth/afskauthlib/Makefile.in | 4 ++-- lib/auth/pam/Makefile.in | 4 ++-- lib/auth/sia/Makefile.in | 4 ++-- lib/des/Makefile.in | 28 +++++++++++----------------- lib/editline/Makefile.in | 4 ++-- lib/kafs/Makefile.in | 4 ++-- lib/otp/Makefile.in | 4 ++-- lib/roken/Makefile.in | 4 ++-- lib/sl/Makefile.in | 4 ++-- 21 files changed, 46 insertions(+), 52 deletions(-) diff --git a/appl/ftp/Makefile.in b/appl/ftp/Makefile.in index 86a39b177..9f2c24a65 100644 --- a/appl/ftp/Makefile.in +++ b/appl/ftp/Makefile.in @@ -38,4 +38,4 @@ clean cleandir: distclean: for i in $(SUBDIRS); \ do (cd $$i && $(MAKE) $(MFLAGS) distclean); done - rm -f Makefile config.status config.cache config.log config.h *~ + rm -f Makefile *~ diff --git a/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in index f49750929..2f562de2c 100644 --- a/appl/ftp/common/Makefile.in +++ b/appl/ftp/common/Makefile.in @@ -29,7 +29,7 @@ LIB = $(LIBNAME).$(LIBEXT) all: $(LIB) .c.o: - $(CC) -c $(CFLAGS) -I$(srcdir) -I../../../include -I../../.. $(DEFS) $< + $(CC) -c $(CFLAGS) -I$(srcdir) -I../../../include $(DEFS) $< $(LIB): $(libcommon_OBJS) rm -f $@ @@ -49,4 +49,4 @@ clean cleandir: distclean: rm -f Makefile -$(OBJECTS): ../../../config.h +$(OBJECTS): ../../../include/config.h diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in index 7f54ec186..1fd46b220 100644 --- a/appl/ftp/ftp/Makefile.in +++ b/appl/ftp/ftp/Makefile.in @@ -73,4 +73,4 @@ clean cleandir: distclean: rm -f Makefile -$(OBJECTS): ../../../config.h +$(OBJECTS): ../../../include/config.h diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in index be5ce0d7f..d7404849d 100644 --- a/appl/ftp/ftpd/Makefile.in +++ b/appl/ftp/ftpd/Makefile.in @@ -52,7 +52,7 @@ OBJECTS = $(ftpd_OBJS) all: $(PROGS) .c.o: - $(CC) -c $(CFLAGS) -I$(srcdir) -I../../.. -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $< + $(CC) -c $(CFLAGS) -I$(srcdir) -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $< install: all $(MKINSTALLDIRS) $(libexecdir) diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in index 73c9425e7..8926415ef 100644 --- a/appl/kx/Makefile.in +++ b/appl/kx/Makefile.in @@ -49,7 +49,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $< install: all $(MKINSTALLDIRS) $(bindir) @@ -107,4 +107,4 @@ rxtelnet: rxtelnet.in sed -e "s!%bindir%!$(bindir)!" $(srcdir)/rxtelnet.in > $@ chmod +x $@ -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in index 01267634e..85e753d10 100644 --- a/appl/otp/Makefile.in +++ b/appl/otp/Makefile.in @@ -40,7 +40,7 @@ SOURCES = $(SOURCES_OTP) $(SOURCES_OTPPRINT) all: $(PROGS) .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $< install: all $(MKINSTALLDIRS) $(bindir) @@ -84,4 +84,4 @@ otp$(EXECSUFFIX): $(OBJECTS_OTP) otpprint$(EXECSUFFIX): $(OBJECTS_OTPPRINT) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in index 8a11f8304..4a296fa38 100644 --- a/appl/popper/Makefile.in +++ b/appl/popper/Makefile.in @@ -50,7 +50,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $< install: all $(MKINSTALLDIRS) $(bindir) @@ -92,4 +92,4 @@ OTPLIB=-L../../lib/otp -lotp popper$(EXECSUFFIX): $(OBJECTS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h diff --git a/appl/telnet/Makefile.in b/appl/telnet/Makefile.in index b36337aab..27780d27e 100644 --- a/appl/telnet/Makefile.in +++ b/appl/telnet/Makefile.in @@ -36,4 +36,4 @@ clean cleandir: distclean: for i in $(SUBDIRS); \ do (cd $$i && $(MAKE) $(MFLAGS) distclean); done - rm -f Makefile config.status config.cache config.log config.h *~ + rm -f Makefile *~ diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in index 8d243c190..eeee90777 100644 --- a/appl/telnet/libtelnet/Makefile.in +++ b/appl/telnet/libtelnet/Makefile.in @@ -18,16 +18,16 @@ LIB = $(LIBNAME).$(LIBEXT) prefix = @prefix@ -SOURCES=auth.c encrypt.c genget.c enc_des.c misc.c kerberos.c read_password.c +SOURCES=auth.c encrypt.c genget.c enc_des.c misc.c kerberos.c kerberos5.c read_password.c -OBJECTS=auth.o encrypt.o genget.o enc_des.o misc.o kerberos.o read_password.o +OBJECTS=auth.o encrypt.o genget.o enc_des.o misc.o kerberos.o kerberos5.o read_password.o all: $(LIB) libtop = @libtop@ .c.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I../../.. -I$(srcdir)/.. $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I$(srcdir)/.. $< $(LIB): $(OBJECTS) rm -f $@ diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in index 11216c19d..f32210d2a 100644 --- a/appl/telnet/telnet/Makefile.in +++ b/appl/telnet/telnet/Makefile.in @@ -45,7 +45,7 @@ KLIB=$(LIBKRB) $(LIBDES) all: $(PROGS) .c.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I$(srcdir)/.. $< telnet$(EXECSUFFIX): $(OBJECTS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ @LIB_setupterm@ $(LIBROKEN) diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in index 51a365b8a..ed5494ec1 100644 --- a/appl/telnet/telnetd/Makefile.in +++ b/appl/telnet/telnetd/Makefile.in @@ -48,7 +48,7 @@ KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES) all: $(PROGS) .c.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. -I. -I$(srcdir) $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I$(srcdir)/.. -I. -I$(srcdir) $< telnetd$(EXECSUFFIX): $(OBJECTS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN) diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in index 95828ed2c..4613e57c1 100644 --- a/appl/xnlock/Makefile.in +++ b/appl/xnlock/Makefile.in @@ -47,7 +47,7 @@ Wall: make CFLAGS="$(XINCS) -g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $< install: all $(MKINSTALLDIRS) $(bindir) @@ -96,4 +96,4 @@ LIBROKEN=-L../../lib/roken -lroken xnlock$(EXECSUFFIX): xnlock.o $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in index 2b435b67d..597395179 100644 --- a/lib/auth/afskauthlib/Makefile.in +++ b/lib/auth/afskauthlib/Makefile.in @@ -39,7 +39,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../../.. -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< install: all $(MKINSTALLDIRS) $(libdir) @@ -71,7 +71,7 @@ dist: $(DISTFILES) || cp -p $$file ../`cat ../.fname`/lib; \ done -$(OBJECTS): ../../../config.h +$(OBJECTS): ../../../include/config.h $(LIB): $(OBJECTS) rm -f $@ diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in index 539499685..13078ab2e 100644 --- a/lib/auth/pam/Makefile.in +++ b/lib/auth/pam/Makefile.in @@ -38,7 +38,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../../.. -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< install: all $(MKINSTALLDIRS) $(libdir) @@ -71,7 +71,7 @@ dist: $(DISTFILES) done -$(OBJECTS): ../../../config.h +$(OBJECTS): ../../../include/config.h $(LIB): $(OBJECTS) rm -f $(LIB) diff --git a/lib/auth/sia/Makefile.in b/lib/auth/sia/Makefile.in index 840e322a9..ecb8f297d 100644 --- a/lib/auth/sia/Makefile.in +++ b/lib/auth/sia/Makefile.in @@ -38,7 +38,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../../.. -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< install: all $(MKINSTALLDIRS) $(libdir) @@ -71,7 +71,7 @@ dist: $(DISTFILES) done -$(OBJECTS): ../../../config.h +$(OBJECTS): ../../../include/config.h $(LIB): $(OBJECTS) rm -f $(LIB) diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in index 5893544f6..6478bbb03 100644 --- a/lib/des/Makefile.in +++ b/lib/des/Makefile.in @@ -59,22 +59,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< - -destest.o: destest.c - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< - -des.o: des.c - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< - -rpw.o: rpw.c - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< - -speed.o: speed.c - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< - -mdtest.o: mdtest.c - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< install: all $(MKINSTALLDIRS) $(libdir) @@ -123,6 +108,15 @@ $(LIBNAME).$(SHLIBEXT): $(LIBOBJ) rm -f $@ $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(LIBOBJ) +# To make psoriaris make happy we have to mention these files in some +# rule, so we might as well put them here. + +mdtest.o: mdtest.c +destest.o: destest.c +des.o: des.c +rpw.o: rpw.c +speed.o: speed.c + mdtest$(EXECSUFFIX): mdtest.o $(LIB) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ mdtest.o -L. -ldes @@ -138,4 +132,4 @@ rpw$(EXECSUFFIX): rpw.o $(LIB) speed$(EXECSUFFIX): speed.o $(LIB) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ speed.o -L. -ldes -$(LIBOBJ): ../../config.h +$(LIBOBJ): ../../include/config.h diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in index dba495d09..bcd638335 100644 --- a/lib/editline/Makefile.in +++ b/lib/editline/Makefile.in @@ -40,7 +40,7 @@ Wall: make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< install: all $(MKINSTALLDIRS) $(libdir) @@ -80,4 +80,4 @@ $(LIBNAME).$(SHLIBEXT): $(OBJECTS) rm -f $@ $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(OBJECTS) -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in index 3be484677..e93db0f8b 100644 --- a/lib/kafs/Makefile.in +++ b/lib/kafs/Makefile.in @@ -41,7 +41,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< install: all $(MKINSTALLDIRS) $(libdir) @@ -87,4 +87,4 @@ $(LIBNAME).$(SHLIBEXT): $(OBJECTS) afslib.so: afslib.o ld -o $@ -bM:SRE -bI:$(srcdir)/afsl.exp -bE:$(srcdir)/afslib.exp -bnoentry afslib.o -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in index 62f593489..269acb5ee 100644 --- a/lib/otp/Makefile.in +++ b/lib/otp/Makefile.in @@ -54,7 +54,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $< install: all $(MKINSTALLDIRS) $(libdir) @@ -92,6 +92,6 @@ $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS) rm -f $@ $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(LIB_OBJECTS) -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h .PHONY: all install uninstall check clean mostlyclean distclean realclean diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in index 68ea80535..7ad622745 100644 --- a/lib/roken/Makefile.in +++ b/lib/roken/Makefile.in @@ -54,7 +54,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $< install: all @@ -91,4 +91,4 @@ $(LIBNAME).$(SHLIBEXT): $(OBJECTS) rm -f $@ $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(OBJECTS) -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in index bf022f785..67775b30a 100644 --- a/lib/sl/Makefile.in +++ b/lib/sl/Makefile.in @@ -45,7 +45,7 @@ Wall: make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) -I$(srcdir)/../des $(CFLAGS) $(PICFLAGS) $< install: all $(MKINSTALLDIRS) $(libdir) @@ -79,6 +79,6 @@ $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS) rm -f $@ $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(LIB_OBJECTS) -$(OBJECTS): ../../config.h +$(OBJECTS): ../../include/config.h .PHONY: all install uninstall check clean mostlyclean distclean realclean