Link with roken before and after LIBS

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1085 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-12-04 23:50:02 +00:00
parent 3b270c4517
commit 477bde3f3f
8 changed files with 21 additions and 17 deletions

View File

@@ -49,7 +49,7 @@ install: all
for x in $(PROGS); do $(INSTALL) $$x $(prefix)/bin; done
ftp: $(ftp_OBJS) # ../common/libcommon.a
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(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) -L$(LIBTOP)/roken -lroken
TAGS: $(SOURCES)
etags $(SOURCES)

View File

@@ -56,7 +56,7 @@ install: all
ftpd: $(ftpd_OBJS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o ftpd $(ftpd_OBJS) ../common/libcommon.a $(LIBKAFS) $(LIBKRB) $(LIBOTP) $(LIBDES) $(LIBROKEN) $(LIBS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o ftpd $(ftpd_OBJS) ../common/libcommon.a $(LIBKAFS) $(LIBKRB) $(LIBOTP) $(LIBDES) $(LIBROKEN) $(LIBS) $(LIBROKEN)
ftpcmd.c: ftpcmd.y
$(YACC) $(YFLAGS) $<

View File

@@ -77,13 +77,14 @@ dist: $(DISTFILES)
|| cp -p $$file ../`cat ../.fname`/lib; \
done
KLIB= -L../../lib/krb -lkrb -L../../lib/des -ldes -L../../lib/roken -lroken
KLIB= -L../../lib/krb -lkrb -L../../lib/des -ldes
LIBROKEN=-L../../lib/roken -lroken
kx: $(OBJECTS_KX)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
kxd: $(OBJECTS_KXD)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
rxterm: rxterm.in
sed -e "s!%bindir%!$(bindir)!" $(srcdir)/rxterm.in > $@

View File

@@ -63,12 +63,13 @@ distclean: clean
realclean: distclean
rm -f TAGS
OLIB=-L../../lib/otp -lotp -L../../lib/des -ldes -L../../lib/roken -lroken
OLIB=-L../../lib/otp -lotp -L../../lib/des -ldes
LIBROKEN=-L../../lib/roken -lroken
otp: $(OBJECTS_OTP)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
otpprint: $(OBJECTS_OTPPRINT)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
$(OBJECTS): ../../config.h

View File

@@ -74,10 +74,11 @@ dist: $(DISTFILES)
|| cp -p $$file ../`cat ../.fname`/lib; \
done
KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes -L../../lib/roken -lroken
KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
LIBROKEN=-L../../lib/roken -lroken
OTPLIB=-L../../lib/otp -lotp
popper: $(OBJECTS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(OTPLIB) $(KLIB) $(LIBS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
$(OBJECTS): ../../config.h

View File

@@ -35,7 +35,7 @@ LIBKRB = -L../../../lib/krb -lkrb
LIBDES = -L../../../lib/des -ldes
LIBROKEN = -L../../../lib/roken -lroken
KLIB=$(LIBKRB) $(LIBDES) $(LIBROKEN)
KLIB=$(LIBKRB) $(LIBDES)
all: telnet
@@ -44,7 +44,7 @@ all: telnet
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. $<
telnet: $(OBJECTS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnet $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) @LIB_tgetent@ @LIB_setupterm@
$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnet $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ @LIB_setupterm@ $(LIBROKEN)
install: all
$(MKINSTALLDIRS) $(prefix)/bin

View File

@@ -38,7 +38,7 @@ LIBDES = -L../../../lib/des -ldes
LIBKAFS = @KRB_KAFS_LIB@
LIBROKEN = -L../../../lib/roken -lroken
KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES) $(LIBROKEN)
KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES)
all: telnetd
@@ -47,7 +47,7 @@ all: telnetd
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. -I. -I$(srcdir) $<
telnetd: $(OBJECTS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) @LIB_tgetent@
$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
install: all
$(MKINSTALLDIRS) $(prefix)/libexec

View File

@@ -78,9 +78,10 @@ dist: $(DISTFILES)
|| cp -p $$file ../`cat ../.fname`/lib; \
done
KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes -L../../lib/roken -lroken
KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
LIBROKEN=-L../../lib/roken -lroken
xnlock: xnlock.o
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBS)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
$(OBJECTS): ../../config.h