--- ./libmnote/hp/Makefile.in Tue Jan 7 12:17:16 2003 +++ ../libmnote-0.5.6/./libmnote/hp/Makefile.in Tue Feb 18 17:00:00 2003 @@ -122,11 +122,11 @@ $(LIBEXIF_CFLAGS) -noinst_LTLIBRARIES = libmnote-hp.la +noinst_LTLIBRARIES = libmnote-hp.a libmnote_hp_la_SOURCES = \ mnote-hp-data.c mnote-hp-data.h -libmnote_hp_la_LDFLAGS = -avoid-version $(LIBEXIF_LIBS) +libmnote_hp_la_LDFLAGS = -avoid-version $(LIBEXIF_LIBS) -static subdir = libmnote/hp mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -173,7 +173,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libmnote-hp.la: $(libmnote_hp_la_OBJECTS) $(libmnote_hp_la_DEPENDENCIES) +libmnote-hp.a: $(libmnote_hp_la_OBJECTS) $(libmnote_hp_la_DEPENDENCIES) $(LINK) $(libmnote_hp_la_LDFLAGS) $(libmnote_hp_la_OBJECTS) $(libmnote_hp_la_LIBADD) $(LIBS) mostlyclean-compile: --- ./libmnote/fuji/Makefile.in Tue Jan 7 12:17:16 2003 +++ ../libmnote-0.5.6/./libmnote/fuji/Makefile.in Tue Feb 18 17:00:02 2003 @@ -124,13 +124,13 @@ $(LIBEXIF_CFLAGS) -noinst_LTLIBRARIES = libmnote-fuji.la +noinst_LTLIBRARIES = libmnote-fuji.a libmnote_fuji_la_SOURCES = \ mnote-fuji-entry.c mnote-fuji-entry.h \ mnote-fuji-data.c mnote-fuji-data.h \ mnote-fuji-tag.c mnote-fuji-tag.h -libmnote_fuji_la_LDFLAGS = -avoid-version $(LIBEXIF_LIBS) +libmnote_fuji_la_LDFLAGS = -avoid-version $(LIBEXIF_LIBS) -static subdir = libmnote/fuji mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -180,7 +180,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libmnote-fuji.la: $(libmnote_fuji_la_OBJECTS) $(libmnote_fuji_la_DEPENDENCIES) +libmnote-fuji.a: $(libmnote_fuji_la_OBJECTS) $(libmnote_fuji_la_DEPENDENCIES) $(LINK) $(libmnote_fuji_la_LDFLAGS) $(libmnote_fuji_la_OBJECTS) $(libmnote_fuji_la_LIBADD) $(LIBS) mostlyclean-compile: --- ./libmnote/Makefile.in Tue Jan 7 12:17:16 2003 +++ ../libmnote-0.5.6/./libmnote/Makefile.in Tue Feb 18 17:22:32 2003 @@ -132,13 +132,13 @@ libmnote_la_SOURCES = \ mnote-data.c -libmnote_la_LIBADD = -lm \ - canon/libmnote-canon.la \ - fuji/libmnote-fuji.la \ - hp/libmnote-hp.la \ - olympus/libmnote-olympus.la \ - pentax/libmnote-pentax.la \ - $(LIBEXIF_LIBS) +libmnote_la_LIBADD = -lm -all \ + canon/libmnote-canon.a \ + fuji/libmnote-fuji.a \ + hp/libmnote-hp.a \ + olympus/libmnote-olympus.a \ + pentax/libmnote-pentax.a \ + -notall $(LIBEXIF_LIBS) libmnoteincludedir = $(includedir)/libmnote @@ -158,9 +158,9 @@ CONFIG_CLEAN_FILES = libmnote.pc LTLIBRARIES = $(lib_LTLIBRARIES) -libmnote_la_DEPENDENCIES = canon/libmnote-canon.la fuji/libmnote-fuji.la \ - hp/libmnote-hp.la olympus/libmnote-olympus.la \ - pentax/libmnote-pentax.la +libmnote_la_DEPENDENCIES = canon/libmnote-canon.a fuji/libmnote-fuji.a \ + hp/libmnote-hp.a olympus/libmnote-olympus.a \ + pentax/libmnote-pentax.a am_libmnote_la_OBJECTS = mnote-data.lo libmnote_la_OBJECTS = $(am_libmnote_la_OBJECTS) @@ -167,7 +167,7 @@ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ -LIBS = @LIBS@ +LIBS = @LIBS@ $(INTLLIBS) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mnote-data.Plo --- ./libmnote/canon/Makefile.in Tue Jan 7 12:17:16 2003 +++ ../libmnote-0.5.6/./libmnote/canon/Makefile.in Tue Feb 18 17:00:04 2003 @@ -124,13 +124,13 @@ $(LIBEXIF_CFLAGS) -noinst_LTLIBRARIES = libmnote-canon.la +noinst_LTLIBRARIES = libmnote-canon.a libmnote_canon_la_SOURCES = \ mnote-canon-data.c mnote-canon-data.h \ mnote-canon-entry.c mnote-canon-entry.h \ mnote-canon-tag.c mnote-canon-tag.h -libmnote_canon_la_LDFLAGS = $(LIBEXIF_LIBS) -avoid-version +libmnote_canon_la_LDFLAGS = $(LIBEXIF_LIBS) -avoid-version -static subdir = libmnote/canon mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -180,7 +180,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libmnote-canon.la: $(libmnote_canon_la_OBJECTS) $(libmnote_canon_la_DEPENDENCIES) +libmnote-canon.a: $(libmnote_canon_la_OBJECTS) $(libmnote_canon_la_DEPENDENCIES) $(LINK) $(libmnote_canon_la_LDFLAGS) $(libmnote_canon_la_OBJECTS) $(libmnote_canon_la_LIBADD) $(LIBS) mostlyclean-compile: --- ./libmnote/pentax/Makefile.in Tue Jan 7 12:17:17 2003 +++ ../libmnote-0.5.6/./libmnote/pentax/Makefile.in Tue Feb 18 16:59:55 2003 @@ -124,13 +124,13 @@ $(LIBEXIF_CFLAGS) -noinst_LTLIBRARIES = libmnote-pentax.la +noinst_LTLIBRARIES = libmnote-pentax.a libmnote_pentax_la_SOURCES = \ mnote-pentax-entry.c mnote-pentax-entry.h \ mnote-pentax-data.c mnote-pentax-data.h \ mnote-pentax-tag.c mnote-pentax-tag.h -libmnote_pentax_la_LDFLAGS = -avoid-version $(LIBEXIF_LIBS) +libmnote_pentax_la_LDFLAGS = -avoid-version $(LIBEXIF_LIBS) -static subdir = libmnote/pentax mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -180,7 +180,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libmnote-pentax.la: $(libmnote_pentax_la_OBJECTS) $(libmnote_pentax_la_DEPENDENCIES) +libmnote-pentax.a: $(libmnote_pentax_la_OBJECTS) $(libmnote_pentax_la_DEPENDENCIES) $(LINK) $(libmnote_pentax_la_LDFLAGS) $(libmnote_pentax_la_OBJECTS) $(libmnote_pentax_la_LIBADD) $(LIBS) mostlyclean-compile: --- ./libmnote/olympus/Makefile.in Tue Jan 7 12:17:17 2003 +++ ../libmnote-0.5.6/./libmnote/olympus/Makefile.in Tue Feb 18 16:59:58 2003 @@ -124,13 +124,13 @@ $(LIBEXIF_CFLAGS) -noinst_LTLIBRARIES = libmnote-olympus.la +noinst_LTLIBRARIES = libmnote-olympus.a libmnote_olympus_la_SOURCES = \ mnote-olympus-entry.c mnote-olympus-entry.h \ mnote-olympus-data.c mnote-olympus-data.h \ mnote-olympus-tag.c mnote-olympus-tag.h -libmnote_olympus_la_LDFLAGS = -avoid-version $(LIBEXIF_LIBS) +libmnote_olympus_la_LDFLAGS = -avoid-version $(LIBEXIF_LIBS) -static subdir = libmnote/olympus mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -180,7 +180,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libmnote-olympus.la: $(libmnote_olympus_la_OBJECTS) $(libmnote_olympus_la_DEPENDENCIES) +libmnote-olympus.a: $(libmnote_olympus_la_OBJECTS) $(libmnote_olympus_la_DEPENDENCIES) $(LINK) $(libmnote_olympus_la_LDFLAGS) $(libmnote_olympus_la_OBJECTS) $(libmnote_olympus_la_LIBADD) $(LIBS) mostlyclean-compile: --- ./ltmain.sh Thu Dec 12 13:00:58 2002 +++ ../libmnote-0.5.6/./ltmain.sh Tue Feb 18 16:54:33 2003 @@ -61,7 +61,7 @@ default_mode= help="Try \`$progname --help' for more information." magic="%%%MAGIC variable%%%" -mkdir="mkdir" +mkdir="mkdir -p" mv="mv -f" rm="rm -f"