now builds even with broken makes

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@953 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-11-14 03:18:52 +00:00
parent 480d3ee318
commit 05e71e804e
8 changed files with 59 additions and 15 deletions

View File

@@ -1,12 +1,13 @@
# $Id$ # $Id$
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH=@srcdir@
SHELL = /bin/sh SHELL = /bin/sh
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
CC = @CC@ CC = @CC@
AR = ar
RANLIB = @RANLIB@ RANLIB = @RANLIB@
DEFS = @DEFS@ DEFS = @DEFS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@@ -17,6 +18,9 @@ prefix = @prefix@
exec_prefix = $(prefix) exec_prefix = $(prefix)
libdir = $(exec_prefix)/lib libdir = $(exec_prefix)/lib
SOURCES = base64.c glob.c
OBJECTS = $(libcommon_OBJS)
libcommon_OBJS = base64.o glob.o libcommon_OBJS = base64.o glob.o
all: libcommon.a all: libcommon.a
@@ -28,11 +32,15 @@ libcommon.a: $(libcommon_OBJS)
ar cr libcommon.a $(libcommon_OBJS) ar cr libcommon.a $(libcommon_OBJS)
$(RANLIB) libcommon.a $(RANLIB) libcommon.a
install: install:
TAGS: $(SOURCES)
etags $(SOURCES)
clean cleandir: clean cleandir:
rm -f *~ *.o libcommon.a core \#* rm -f *~ *.o libcommon.a core \#*
distclean: distclean:
rm -f Makefile rm -f Makefile
$(OBJECTS): ../../../config.h

View File

@@ -2,18 +2,18 @@
# $Id$ # $Id$
# #
SHELL = /bin/sh
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
SHELL = /bin/sh
CC = @CC@ CC = @CC@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
DEFS = @DEFS@ DEFS = @DEFS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
LD_FLAGS = @LD_FLAGS@ LD_FLAGS = @LD_FLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@ INSTALL = @INSTALL@
@@ -30,9 +30,16 @@ LIBTOP = $(ATHENA)/lib
PROGS = ftp PROGS = ftp
ftp_OBJS = cmds.o cmdtab.o ftp.o krb4.o main.o ruserpass.o domacro.o globals.o kauth.o ftp_OBJS = cmds.o cmdtab.o ftp.o krb4.o main.o ruserpass.o domacro.o \
globals.o kauth.o
all: ftp ftp_SOURCES = cmds.c cmdtab.c ftp.c krb4.c main.c ruserpass.c \
domacro.c globals.c kauth.c
OBJECTS = $(ftp_OBJS)
SOURCES = $(ftp_SOURCES)
all: $(PROGS)
.c.o: .c.o:
$(CC) -c $(CFLAGS) -I$(srcdir) -I../../.. -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $< $(CC) -c $(CFLAGS) -I$(srcdir) -I../../.. -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $<
@@ -41,11 +48,16 @@ install: all
$(MKINSTALLDIRS) $(prefix)/bin $(MKINSTALLDIRS) $(prefix)/bin
for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done
ftp: $(ftp_OBJS) ../common/libcommon.a ftp: $(ftp_OBJS) # ../common/libcommon.a
$(CC) $(LD_FLAGS) $(LDFLAGS) -o ftp $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS)
TAGS: $(SOURCES)
etags $(SOURCES)
clean cleandir: clean cleandir:
rm -f *~ *.o core ftp \#* rm -f *~ *.o core ftp \#*
distclean: distclean:
rm -f Makefile rm -f Makefile
$(OBJECTS): ../../../config.h

View File

@@ -40,8 +40,12 @@ LIBROKEN= $(LIBTOP)/roken/libroken.a
PROGS = ftpd PROGS = ftpd
ftpd_SOURCES = ftpd.c ftpcmd.c logwtmp.c popen.c auth.c krb4.c kauth.c
ftpd_OBJS = ftpd.o ftpcmd.o logwtmp.o popen.o auth.o krb4.o kauth.o ftpd_OBJS = ftpd.o ftpcmd.o logwtmp.o popen.o auth.o krb4.o kauth.o
SOURCES = $(ftpd_SOURCES)
OBJECTS = $(ftpd_OBJS)
all: ftpd all: ftpd
.c.o: .c.o:
@@ -60,6 +64,9 @@ ftpcmd.c: ftpcmd.y
chmod a-w y.tab.c chmod a-w y.tab.c
mv -f y.tab.c ftpcmd.c mv -f y.tab.c ftpcmd.c
TAGS: $(SOURCES)
etags $(SOURCES)
clean cleandir: clean cleandir:
rm -f *~ *.o core ftpd ftpcmd.c \#* rm -f *~ *.o core ftpd ftpcmd.c \#*

View File

@@ -35,6 +35,9 @@ libtelnet.a: $(OBJECTS)
install: install:
@true @true
TAGS: $(SOURCES)
etags $(SOURCES)
clean cleandir: clean cleandir:
rm -f *.o *.a \#* *~ core rm -f *.o *.a \#* *~ core

View File

@@ -22,7 +22,7 @@ prefix = @prefix@
exec_prefix = $(prefix) exec_prefix = $(prefix)
libdir = $(exec_prefix)/lib libdir = $(exec_prefix)/lib
SOURCES=commands.c main.c network.c ring.c \ SOURCES=authenc.c commands.c main.c network.c ring.c \
sys_bsd.c telnet.c terminal.c \ sys_bsd.c telnet.c terminal.c \
utilities.c $(GETOPT_SRC) utilities.c $(GETOPT_SRC)
@@ -51,6 +51,9 @@ install: all
$(MKINSTALLDIRS) $(prefix)/bin $(MKINSTALLDIRS) $(prefix)/bin
for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done
TAGS: $(SOURCES)
etags $(SOURCES)
clean cleandir: clean cleandir:
rm -f *.o *.a telnet \#* *~ core rm -f *.o *.a telnet \#* *~ core

View File

@@ -28,11 +28,9 @@ PROGS = telnetd
SOURCES=telnetd.c state.c termstat.c slc.c sys_term.c \ SOURCES=telnetd.c state.c termstat.c slc.c sys_term.c \
utility.c global.c authenc.c utility.c global.c authenc.c
OBJECTS=telnetd.o state.o termstat.o slc.o sys_term.o \ OBJECTS=telnetd.o state.o termstat.o slc.o sys_term.o \
utility.o global.o authenc.o utility.o global.o authenc.o
libtop = @libtop@ libtop = @libtop@
LIBKRB = -L../../../lib/krb -lkrb LIBKRB = -L../../../lib/krb -lkrb
@@ -55,6 +53,9 @@ install: all
$(MKINSTALLDIRS) $(prefix)/libexec $(MKINSTALLDIRS) $(prefix)/libexec
for x in $(PROGS); do $(INSTALL) $$x $(prefix)/libexec; done for x in $(PROGS); do $(INSTALL) $$x $(prefix)/libexec; done
TAGS: $(SOURCES)
etags $(SOURCES)
clean cleandir: clean cleandir:
rm -f *.o *.a telnetd \#* *~ core rm -f *.o *.a telnetd \#* *~ core

View File

@@ -58,6 +58,9 @@ rpw.o: rpw.c
speed.o: speed.c speed.o: speed.c
$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $< $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
mdtest.o: mdtest.c
$(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) $(CFLAGS) $<
install: all install: all
$(MKINSTALLDIRS) $(libdir) $(MKINSTALLDIRS) $(libdir)
$(INSTALL) -m 0555 $(LIB) $(libdir) $(INSTALL) -m 0555 $(LIB) $(libdir)

View File

@@ -31,6 +31,13 @@ SHLIBEXT = @SHLIBEXT@
SHARED = @SHARED@ SHARED = @SHARED@
LIB = $(LIBNAME).$(LIBEXT) LIB = $(LIBNAME).$(LIBEXT)
SOURCES = err.c errx.c getcwd.c getdtablesize.c getent.c getopt.c \
getusershell.c herror.c hstrerror.c inaddr2str.c inet_aton.c \
k_getpwnam.c k_getpwuid.c memmove.c mini_inetd.c putenv.c setegid.c \
setenv.c seteuid.c signal.c strcasecmp.c strchr.c strdup.c strerror.c \
strftime.c strnlen.c strrchr.c tm2time.c unsetenv.c verify.c verr.c \
verrx.c vsyslog.c vwarn.c vwarnx.c warn.c warnx.c
OBJECTS = k_getpwuid.o k_getpwnam.o signal.o tm2time.o \ OBJECTS = k_getpwuid.o k_getpwnam.o signal.o tm2time.o \
verify.o inaddr2str.o mini_inetd.o \ verify.o inaddr2str.o mini_inetd.o \
@LIBOBJS@ @LIBOBJS@