Index: debathena-moira/clients/addusr/Makefile.in =================================================================== --- debathena-moira.orig/clients/addusr/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/addusr/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,22 +18,25 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -OBJS=addusr.o +OBJS=addusr.lo TARGET=addusr -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: depend $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) -m 755 addusr $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -m 755 addusr $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) Index: debathena-moira/clients/blanche/Makefile.in =================================================================== --- debathena-moira.orig/clients/blanche/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/blanche/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,22 +18,25 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -OBJS=blanche.o +OBJS=blanche.lo TARGET=blanche -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) blanche $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) blanche $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) Index: debathena-moira/clients/chfn/Makefile.in =================================================================== --- debathena-moira.orig/clients/chfn/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/chfn/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,6 +18,7 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -24,15 +26,17 @@ TARGET=chfn -OBJS=$(TARGET).o +OBJS=$(TARGET).lo -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) Index: debathena-moira/clients/chpobox/Makefile.in =================================================================== --- debathena-moira.orig/clients/chpobox/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/chpobox/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,6 +18,7 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -24,15 +26,17 @@ TARGET=chpobox -OBJS=$(TARGET).o +OBJS=$(TARGET).lo -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) Index: debathena-moira/clients/chsh/Makefile.in =================================================================== --- debathena-moira.orig/clients/chsh/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/chsh/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,6 +18,7 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -24,15 +26,17 @@ TARGET=chsh -OBJS=$(TARGET).o +OBJS=$(TARGET).lo -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) Index: debathena-moira/clients/mailmaint/Makefile.in =================================================================== --- debathena-moira.orig/clients/mailmaint/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/mailmaint/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @CURSES_LIBS@ @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,22 +18,25 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -OBJS=mailmaint.o +OBJS=mailmaint.lo TARGET=mailmaint -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) mailmaint $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) mailmaint $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) Index: debathena-moira/clients/mitch/Makefile.in =================================================================== --- debathena-moira.orig/clients/mitch/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/mitch/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,22 +18,25 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -OBJS=mitch.o +OBJS=mitch.lo TARGET=mitch -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) mitch $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) mitch $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) Index: debathena-moira/clients/moira/Makefile.in =================================================================== --- debathena-moira.orig/clients/moira/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/moira/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @CURSES_LIBS@ @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,26 +18,29 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -MOBJS= acl.o attach.o cluster.o delete.o globals.o lists.o main.o menu.o \ - menus.o nfs.o pobox.o quota.o user.o utils.o dcmmaint.o printer.o \ - misc.o zephyr.o -NOBJS= namespace.o globals.o lists.o menu.o pobox.o user.o utils.o misc.o +MOBJS= acl.lo attach.lo cluster.lo delete.lo globals.lo lists.lo main.lo menu.lo \ + menus.lo nfs.lo pobox.lo quota.lo user.lo utils.lo dcmmaint.lo printer.lo \ + misc.lo zephyr.lo +NOBJS= namespace.lo globals.lo lists.lo menu.lo pobox.lo user.lo utils.lo misc.lo OBJS= ${MOBJS} ${NOBJS} TARGET=moira namespace -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -44,8 +48,8 @@ depend: install: all - $(INSTALL_PROGRAM) namespace $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) moira $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) namespace $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) moira $(DESTDIR)$(bindir) rm -f $(DESTDIR)$(bindir)/listmaint ln -s moira $(DESTDIR)$(bindir)/listmaint rm -f $(DESTDIR)$(bindir)/dcmmaint @@ -54,7 +58,7 @@ ln -s moira $(DESTDIR)$(bindir)/usermaint moira: $(MOBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(MOBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(MOBJS) $(LIBS) namespace: $(NOBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(NOBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(NOBJS) $(LIBS) Index: debathena-moira/clients/mrcheck/Makefile.in =================================================================== --- debathena-moira.orig/clients/mrcheck/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/mrcheck/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,22 +18,25 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -OBJS=mrcheck.o +OBJS=mrcheck.lo TARGET=mrcheck -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) mrcheck $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) mrcheck $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) Index: debathena-moira/clients/mrtest/Makefile.in =================================================================== --- debathena-moira.orig/clients/mrtest/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/mrtest/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @READLINE_LIBS@ @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,22 +18,25 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -OBJS=mrtest.o +OBJS=mrtest.lo TARGET=mrtest -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) mrtest $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) mrtest $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) Index: debathena-moira/clients/stanley/Makefile.in =================================================================== --- debathena-moira.orig/clients/stanley/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/stanley/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,22 +18,25 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -OBJS=stanley.o +OBJS=stanley.lo TARGET=stanley -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) stanley $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) stanley $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) Index: debathena-moira/clients/stella/Makefile.in =================================================================== --- debathena-moira.orig/clients/stella/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/clients/stella/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=../lib/libmrclient.a @LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,22 +18,25 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=../.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ -OBJS=stella.o +OBJS=stella.lo TARGET=stella -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(OBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -40,7 +44,7 @@ depend: install: all - $(INSTALL_PROGRAM) stella $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) stella $(DESTDIR)$(bindir) $(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) Index: debathena-moira/configure.in =================================================================== --- debathena-moira.orig/configure.in 2008-07-05 13:50:50.000000000 -0400 +++ debathena-moira/configure.in 2008-07-05 14:14:39.000000000 -0400 @@ -46,7 +46,7 @@ AC_PROG_CC AC_PROG_INSTALL -AC_PROG_RANLIB +AC_PROG_LIBTOOL AC_PROG_MAKE_SET if test "$athena" = true; then @@ -453,7 +453,7 @@ LIBS="-lmoira $KLIBS" AC_SUBST(KLIBS) -MR_LIBDEP='$(BUILDTOP)/lib/libmoira.a' +MR_LIBDEP='$(BUILDTOP)/lib/libmoira.la' AC_SUBST(MR_LIBDEP) AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \ Index: debathena-moira/lib/Makefile.in =================================================================== --- debathena-moira.orig/lib/Makefile.in 2008-07-05 13:50:50.000000000 -0400 +++ debathena-moira/lib/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -7,34 +7,45 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) -RANLIB=@RANLIB@ COMPILE_ET=@COMPILE_ET@ +LIBTOOL=@LIBTOOL@ +LDFLAGS=@LDFLAGS@ +KLIBS=@KLIBS@ +ALL_LDFLAGS=$(LDFLAGS) $(KLIBS) + +INSTALL=@INSTALL@ +INSTALL_PROGRAM=@INSTALL_PROGRAM@ + srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ BUILDTOP=.. - -OBJS= critical.o fixhost.o fixname.o \ - hash.o kname_unparse.o krb_et.o mr_access.o mr_auth.o \ - mr_call.o mr_connect.o mr_et.o mr_init.o mr_ops.o mr_query.o \ - nfsparttype.o sq.o strs.o ureg_err.o +top_builddir=@top_builddir@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ + +OBJS= critical.lo fixhost.lo fixname.lo \ + hash.lo kname_unparse.lo krb_et.lo mr_access.lo mr_auth.lo \ + mr_call.lo mr_connect.lo mr_et.lo mr_init.lo mr_ops.lo mr_query.lo \ + nfsparttype.lo sq.lo strs.lo ureg_err.lo ET_H= mr_et.h krb_et.h ureg_err.h ET_C= mr_et.c krb_et.c ureg_err.c -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< -.SUFFIXES: .et +.SUFFIXES: .et .lo .et.c: $(COMPILE_ET) $< -all: depend libmoira.a +all: depend libmoira.la clean: - rm -f $(OBJS) $(ET_H) $(ET_C) libmoira.a + $(LIBTOOL) --mode=clean rm -f $(OBJS) $(ET_H) $(ET_C) libmoira.la cleandir distclean: clean rm -f Makefile @@ -42,7 +53,7 @@ depend: $(ET_C) install: all + $(LIBTOOL) --mode=install $(INSTALL) -D libmoira.la $(DESTDIR)$(libdir)/libmoira.la -libmoira.a: $(OBJS) - ar cru $@ $(OBJS) - $(RANLIB) $@ +libmoira.la: $(OBJS) + $(LIBTOOL) --mode=link $(CC) $(ALL_LDFLAGS) -o $@ $(OBJS) -rpath $(libdir) -version-info 0:0:0 Index: debathena-moira/update/Makefile.in =================================================================== --- debathena-moira.orig/update/Makefile.in 2008-07-05 14:13:48.000000000 -0400 +++ debathena-moira/update/Makefile.in 2008-07-05 14:14:39.000000000 -0400 @@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) +LIBTOOL=@LIBTOOL@ LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ MR_LIBDEP=@MR_LIBDEP@ @@ -17,25 +18,28 @@ srcdir=@srcdir@ VPATH=@srcdir@ SRCTOP=@top_srcdir@ +top_builddir=@top_builddir@ BUILDTOP=.. prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ sbindir=@sbindir@ -SOBJS= auth_002.o auth_003.o checksum.o config.o exec_002.o get_file.o \ - update_server.o xfer_002.o xfer_003.o sendrecv.o -COBJS= update_test.o checksum.o client.o send_file.o ticket.o sendrecv.o +SOBJS= auth_002.lo auth_003.lo checksum.lo config.lo exec_002.lo get_file.lo \ + update_server.lo xfer_002.lo xfer_003.lo sendrecv.lo +COBJS= update_test.lo checksum.lo client.lo send_file.lo ticket.lo sendrecv.lo TARGET=update_server update_test -.c.o: - $(CC) -c $(ALL_CFLAGS) $< +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS) $< all: $(TARGET) clean: - rm -f $(SOBJS) $(COBJS) $(TARGET) + $(LIBTOOL) --mode=clean rm -f $(SOBJS) $(COBJS) $(TARGET) cleandir distclean: clean rm -f Makefile @@ -43,11 +47,11 @@ depend: install: all - $(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) update_test $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) update_server $(DESTDIR)$(sbindir) update_test: $(COBJS) $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS) update_server: $(SOBJS) $(MR_LIBDEP) - $(CC) -o $@ $(LDFLAGS) $(SOBJS) $(LIBS) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SOBJS) $(LIBS) Index: debathena-moira/lib/critical.c =================================================================== --- debathena-moira.orig/lib/critical.c 2008-07-05 14:15:04.000000000 -0400 +++ debathena-moira/lib/critical.c 2008-07-05 14:16:28.000000000 -0400 @@ -33,7 +33,12 @@ /* mode to create the file with */ #define LOGFILEMODE 0644 -extern char *whoami; +char *whoami; + +void set_whoami(char * value) +{ + whoami = value; +} /* This routine sends a class MOIRA zephyrgram of specified instance * and logs to a special logfile the message passed to it via msg