moved version.h and config.h to include

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1497 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-03-23 13:05:18 +00:00
parent 395297ba77
commit cc553f28a9
21 changed files with 46 additions and 52 deletions

View File

@@ -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 *~

View File

@@ -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

View File

@@ -73,4 +73,4 @@ clean cleandir:
distclean:
rm -f Makefile
$(OBJECTS): ../../../config.h
$(OBJECTS): ../../../include/config.h

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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 *~

View File

@@ -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 $@

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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 $@

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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