From afdbdc9c00aecb0e491e10e668a1063f71e83e53 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Sat, 23 May 1998 17:11:17 +0000 Subject: [PATCH] *_a_* -> *_la_* *.o -> *.lo git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4922 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/kadm5/Makefile.am | 4 ++-- lib/krb5/Makefile.am | 6 +++--- lib/otp/Makefile.am | 4 +++- lib/roken/Makefile.am | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am index 480900907..2c87ef21a 100644 --- a/lib/kadm5/Makefile.am +++ b/lib/kadm5/Makefile.am @@ -92,6 +92,6 @@ all-local: $(inc_DATA) .et.c: $(COMPILE_ET) $< -$(libkadm5srv_a_OBJECTS): kadm5_err.h +$(libkadm5srv_la_OBJECTS): kadm5_err.h -client_glue.o server_glue.o: $(srcdir)/common_glue.c +client_glue.lo server_glue.lo: $(srcdir)/common_glue.c diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am index 072a04e16..c3f4a27ad 100644 --- a/lib/krb5/Makefile.am +++ b/lib/krb5/Makefile.am @@ -98,10 +98,10 @@ libkrb5_la_SOURCES = \ $(ERR_FILES) -$(libkrb5_a_OBJECTS): $(srcdir)/krb5-protos.h +$(libkrb5_la_OBJECTS): $(srcdir)/krb5-protos.h $(srcdir)/krb5-protos.h: - cd $(srcdir); perl ../../cf/make-proto.pl $(libkrb5_a_SOURCES) > krb5-protos.h || rm -f krb5-protos.h + cd $(srcdir); perl ../../cf/make-proto.pl $(libkrb5_la_SOURCES) > krb5-protos.h || rm -f krb5-protos.h INCLUDES = $(INCLUDE_krb4) @@ -133,4 +133,4 @@ all-local: $(inc_DATA) .et.h: $(COMPILE_ET) $< -$(libkrb5_a_OBJECTS): krb5_err.h heim_err.h +$(libkrb5_la_OBJECTS): krb5_err.h heim_err.h diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am index 207225540..e58d15f21 100644 --- a/lib/otp/Makefile.am +++ b/lib/otp/Makefile.am @@ -6,7 +6,9 @@ INCLUDES = -I$(top_builddir)/include noinst_PROGRAMS = otptest -otptest_LDADD = libotp.a $(top_builddir)/lib/des/libdes.la $(top_builddir)/lib/roken/libroken.la +otptest_LDADD = libotp.la \ + $(top_builddir)/lib/des/libdes.la \ + $(top_builddir)/lib/roken/libroken.la lib_LTLIBRARIES = libotp.la diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am index de1e57038..f49345a08 100644 --- a/lib/roken/Makefile.am +++ b/lib/roken/Makefile.am @@ -34,7 +34,7 @@ libroken_la_SOURCES = \ libroken_la_LIBADD = @LTLIBOBJS@ -$(LIBOBJS) $(libroken_a_OBJECTS): roken.h +$(LIBOBJS) $(libroken_la_OBJECTS): roken.h incdir = $(includedir) inc_DATA = roken.h @@ -56,7 +56,7 @@ roken.h: make-roken make-roken.c: roken.h.in roken.awk $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c -print_version.o: print_version.h +print_version.lo: print_version.h print_version.h: make-print-version ./make-print-version print_version.h