diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in index c88d479f3..302e460a6 100644 --- a/appl/popper/Makefile.in +++ b/appl/popper/Makefile.in @@ -73,6 +73,6 @@ dist: $(DISTFILES) done kpopper: $(OBJECTS) - $(CC) $(LDFLAGS) -o $@ $(OBJECTS) ../../lib/krb/libkrb.a ../../lib/des/libdes.a $(LIBS) + $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -L../../lib/krb -lkrb -L../../lib/des -ldes -L../util/et -lcom_err $(LIBS) $(OBJECTS): ../../config.h diff --git a/appl/telnet/Makefile.in b/appl/telnet/Makefile.in index 8808dc3e0..e761a2d7c 100644 --- a/appl/telnet/Makefile.in +++ b/appl/telnet/Makefile.in @@ -35,3 +35,7 @@ clean cleandir: for i in $(SUBDIRS); \ do (cd $$i; $(MAKE) $(MFLAGS) clean); done +distclean: + for i in $(SUBDIRS); \ + do (cd $$i; $(MAKE) $(MFLAGS) distclean); done + rm -f Makefile config.status config.cache config.log config.h stamp-configure diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in index ad35e3c07..3a9aa5c75 100644 --- a/appl/telnet/libtelnet/Makefile.in +++ b/appl/telnet/libtelnet/Makefile.in @@ -45,3 +45,6 @@ install: clean cleandir: rm -f *.o *.a \#* *~ core + +distclean: clean + rm -f Makefile diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in index 7f9e49893..1e37b577f 100644 --- a/appl/telnet/telnet/Makefile.in +++ b/appl/telnet/telnet/Makefile.in @@ -29,7 +29,7 @@ OBJECTS=authenc.o commands.o main.o network.o ring.o sys_bsd.o \ libtop=../../../lib -KLIB=$(libtop)/krb/libkrb.a $(libtop)/des/libdes.a +KLIB=-L$(libtop)/krb -lkrb -L$(libtop)/des -ldes -L../../../util/et -lcom_err all: telnet @@ -47,3 +47,6 @@ install: all clean cleandir: rm -f *.o *.a telnet \#* *~ core + +distclean: clean + rm -f Makefile diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in index 893172899..657735035 100644 --- a/appl/telnet/telnetd/Makefile.in +++ b/appl/telnet/telnetd/Makefile.in @@ -30,7 +30,7 @@ OBJECTS=telnetd.o state.o termstat.o slc.o sys_term.o \ libtop=../../../lib -KLIB=$(libtop)/kafs/libkafs.a $(libtop)/krb/libkrb.a $(libtop)/des/libdes.a +KLIB=-L$(libtop)/kafs -lkafs -L$(libtop)/krb -lkrb -L$(libtop)/des -ldes -L../../../util/et -lcom_err all: telnetd @@ -51,4 +51,6 @@ install: all clean cleandir: rm -f *.o *.a telnetd \#* *~ core +distclean: clean + rm -f Makefile diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in index 06a280737..1996ec299 100644 --- a/appl/xnlock/Makefile.in +++ b/appl/xnlock/Makefile.in @@ -68,6 +68,6 @@ dist: $(DISTFILES) xnlock: xnlock.o - $(CC) $(LDFLAGS) -o $@ xnlock.o ../../lib/kafs/libkafs.a ../../lib/krb/libkrb.a ../../lib/des/libdes.a $(LIBS) + $(CC) $(LDFLAGS) -o $@ xnlock.o -L../../lib/kafs -lkafs -L../../lib/krb -lkrb -L../../lib/des -ldes $(LIBS) $(OBJECTS): ../../config.h diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in index b87ff7b7b..1496b3c64 100644 --- a/lib/des/Makefile.in +++ b/lib/des/Makefile.in @@ -10,6 +10,8 @@ RANLIB = @RANLIB@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ +PICFLAGS = @PICFLAGS@ + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKDIRHIER = @top_srcdir@/mkdirhier-sh @@ -18,7 +20,12 @@ prefix = @prefix@ exec_prefix = $(prefix) libdir = $(exec_prefix)/lib -LIB = libdes.a +PICFLAGS = @PICFLAGS@ + +LIBNAME = libdes +LIBEXT = @LIBEXT@ +MAJORVER = @MAJORVER@ +LIB = $(LIBNAME).$(LIBEXT) SOURCES = cbc_cksm.c cbc_enc.c ecb_enc.c pcbc_enc.c \ qud_cksm.c read_pwd.c set_key.c str2key.c \ @@ -38,12 +45,11 @@ Wall: make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $(PICFLAGS) $< install: all $(MKDIRHIER) $(prefix)/lib $(INSTALL_DATA) $(LIB) $(libdir) - -$(RANLIB) $(libdir)/$(LIB) uninstall: @@ -53,7 +59,7 @@ TAGS: $(SOURCES) check: clean: - rm -f *.a *.o + rm -f $(LIB) *.o mostlyclean: clean @@ -69,9 +75,13 @@ dist: $(DISTFILES) || cp -p $$file ../`cat ../.fname`/lib; \ done -$(LIB): $(OBJECTS) +$(LIBNAME).a: $(OBJECTS) rm -f $@ $(AR) cr $@ $(OBJECTS) -$(RANLIB) $@ +$(LIBNAME).so.$(MAJORVER): $(OBJECTS) + rm -f $@ + $(CC) -shared -Wl,-soname,$@ -o $@ $(OBJECTS) + $(OBJECTS): ../../config.h diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in index adafe63f7..456911802 100644 --- a/lib/kafs/Makefile.in +++ b/lib/kafs/Makefile.in @@ -20,7 +20,12 @@ prefix = @prefix@ exec_prefix = $(prefix) libdir = $(exec_prefix)/lib -LIB = libkafs.a +PICFLAGS = @PICFLAGS@ + +LIBNAME = libkafs +LIBEXT = @LIBEXT@ +MAJORVER = @MAJORVER@ +LIB = $(LIBNAME).$(LIBEXT) SOURCES = afssys.c @@ -32,12 +37,11 @@ Wall: make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(DEFS) -I../.. -I../../include -I$(srcdir) -I$(srcdir)/../../include $(CFLAGS) $(PICFLAGS) $< install: all $(MKDIRHIER) $(libdir) $(INSTALL_DATA) $(LIB) $(libdir) - -$(RANLIB) $(libdir)/$(LIB) uninstall: @@ -47,7 +51,7 @@ TAGS: $(SOURCES) check: clean: - rm -f *.a *.o + rm -f $(LIB) *.o mostlyclean: clean @@ -63,10 +67,14 @@ dist: $(DISTFILES) || cp -p $$file ../`cat ../.fname`/lib; \ done -$(LIB): $(OBJECTS) +$(LIBNAME).a: $(OBJECTS) rm -f $@ $(AR) cr $@ $(OBJECTS) -if [ "$(AIX_SYSCALL_MAGIC)" = yes ] ; then $(AR) cr $@ $(srcdir)/afsl.exp ; fi -$(RANLIB) $@ +$(LIBNAME).so.$(MAJORVER): $(OBJECTS) + rm -f $@ + $(CC) -shared -Wl,-soname,$@ -o $@ $(OBJECTS) + $(OBJECTS): ../../config.h