From d334c53e8a592f183ace9a8c09e9d5c5b586e969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Groenvall?= Date: Tue, 23 Apr 1996 17:49:39 +0000 Subject: [PATCH] Improved shared library support. Moved krb_err.et from libkrb to libkadm (only referenced from there). git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@426 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftp/Makefile.in | 2 +- appl/ftp/ftpd/Makefile.in | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in index e4bea852a..c92ddd2fa 100644 --- a/appl/ftp/ftp/Makefile.in +++ b/appl/ftp/ftp/Makefile.in @@ -20,7 +20,7 @@ libdir = $(exec_prefix)/lib ATHENA = /usr/athena LIBTOP = ../../../lib -LIBS = $(LIBTOP)/krb/libkrb.a $(LIBTOP)/des/libdes.a $(LIBTOP)/roken/libroken.a +LIBS = -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes $(LIBTOP)/roken/libroken.a ftp_OBJS = cmds.o cmdtab.o ftp.o krb4.o main.o ruserpass.o domacro.o globals.o kauth.o diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in index 83522ff04..4954d9ccb 100644 --- a/appl/ftp/ftpd/Makefile.in +++ b/appl/ftp/ftpd/Makefile.in @@ -17,23 +17,21 @@ prefix = @prefix@ exec_prefix = $(prefix) libdir = $(exec_prefix)/lib -ATHENA = /usr/athena - LIBTOP = ../../../lib -LIBS = ../common/libcommon.a $(LIBTOP)/kafs/libkafs.a $(LIBTOP)/krb/libkrb.a $(LIBTOP)/des/libdes.a $(LIBTOP)/roken/libroken.a +LIBS = ../common/libcommon.a -L$(LIBTOP)/kafs -lkafs -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes $(LIBTOP)/roken/libroken.a ftpd_OBJS = ftpd.o ftpcmd.o logwtmp.o popen.o auth.o krb4.o kauth.o klogin.o all: ftpd .c.o: - $(CC) -c $(CFLAGS) -I. -I$(srcdir) -I.. -I$(srcdir)/.. -I../common -I$(srcdir)/../common -I$(ATHENA)/include $(DEFS) $< + $(CC) -c $(CFLAGS) -I. -I$(srcdir) -I.. -I$(srcdir)/.. -I../common -I$(srcdir)/../common -I$(srcdir)/include $(DEFS) $< install: -ftpd: $(ftpd_OBJS) $(LIBS) +ftpd: $(ftpd_OBJS) $(CC) -o ftpd $(ftpd_OBJS) $(LIBS) ftpcmd.c: ftpcmd.y