oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Link with roken before and after LIBS

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
appl/ftp/ftp/Makefile.in
View File

@@ -49,7 +49,7 @@ install: all
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_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) TAGS: $(SOURCES)
etags $(SOURCES) etags $(SOURCES)

2
appl/ftp/ftpd/Makefile.in
View File

@@ -56,7 +56,7 @@ install: all
ftpd: $(ftpd_OBJS) 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 ftpcmd.c: ftpcmd.y
$(YACC) $(YFLAGS) $< $(YACC) $(YFLAGS) $<

7
appl/kx/Makefile.in
View File

@@ -77,13 +77,14 @@ dist: $(DISTFILES)
|| cp -p $$file ../`cat ../.fname`/lib; \ || cp -p $$file ../`cat ../.fname`/lib; \
done 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) 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) 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 rxterm: rxterm.in
sed -e "s!%bindir%!$(bindir)!" $(srcdir)/rxterm.in > $@ sed -e "s!%bindir%!$(bindir)!" $(srcdir)/rxterm.in > $@

7
appl/otp/Makefile.in
View File

@@ -63,12 +63,13 @@ distclean: clean
realclean: distclean realclean: distclean
rm -f TAGS 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) 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) 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 $(OBJECTS): ../../config.h

5
appl/popper/Makefile.in
View File

@@ -74,10 +74,11 @@ dist: $(DISTFILES)
|| cp -p $$file ../`cat ../.fname`/lib; \ || cp -p $$file ../`cat ../.fname`/lib; \
done 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 OTPLIB=-L../../lib/otp -lotp
popper: $(OBJECTS) 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 $(OBJECTS): ../../config.h

4
appl/telnet/telnet/Makefile.in
View File

@@ -35,7 +35,7 @@ LIBKRB = -L../../../lib/krb -lkrb
LIBDES = -L../../../lib/des -ldes LIBDES = -L../../../lib/des -ldes
LIBROKEN = -L../../../lib/roken -lroken LIBROKEN = -L../../../lib/roken -lroken
KLIB=$(LIBKRB) $(LIBDES) $(LIBROKEN) KLIB=$(LIBKRB) $(LIBDES)
all: telnet all: telnet
@@ -44,7 +44,7 @@ all: telnet
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. $< $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. $<
telnet: $(OBJECTS) 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 install: all
$(MKINSTALLDIRS) $(prefix)/bin $(MKINSTALLDIRS) $(prefix)/bin

4
appl/telnet/telnetd/Makefile.in
View File

@@ -38,7 +38,7 @@ LIBDES = -L../../../lib/des -ldes
LIBKAFS = @KRB_KAFS_LIB@ LIBKAFS = @KRB_KAFS_LIB@
LIBROKEN = -L../../../lib/roken -lroken LIBROKEN = -L../../../lib/roken -lroken
KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES) $(LIBROKEN) KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES)
all: telnetd all: telnetd
@@ -47,7 +47,7 @@ all: telnetd
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. -I. -I$(srcdir) $< $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. -I. -I$(srcdir) $<
telnetd: $(OBJECTS) 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 install: all
$(MKINSTALLDIRS) $(prefix)/libexec $(MKINSTALLDIRS) $(prefix)/libexec

5
appl/xnlock/Makefile.in
View File

@@ -78,9 +78,10 @@ dist: $(DISTFILES)
|| cp -p $$file ../`cat ../.fname`/lib; \ || cp -p $$file ../`cat ../.fname`/lib; \
done 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 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 $(OBJECTS): ../../config.h