From 6d8691c0de9cfac48910551858cdf67bb67dc9ca Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 2 Aug 2007 05:02:00 +0200 Subject: [PATCH] Partially get rid of recursive make, fixing parallel make issue --- configure.ac | 3 --- libexif/Makefile.am | 31 ++++++++++++------------------- libexif/canon/Makefile-files | 7 +++++++ libexif/canon/Makefile.am | 6 ------ libexif/olympus/Makefile-files | 7 +++++++ libexif/olympus/Makefile.am | 6 ------ libexif/pentax/Makefile-files | 7 +++++++ libexif/pentax/Makefile.am | 6 ------ 8 files changed, 33 insertions(+), 40 deletions(-) create mode 100644 libexif/canon/Makefile-files delete mode 100644 libexif/canon/Makefile.am create mode 100644 libexif/olympus/Makefile-files delete mode 100644 libexif/olympus/Makefile.am create mode 100644 libexif/pentax/Makefile-files delete mode 100644 libexif/pentax/Makefile.am diff --git a/configure.ac b/configure.ac index 8b6fc5a..04a0b9e 100644 --- a/configure.ac +++ b/configure.ac @@ -189,9 +189,6 @@ AC_CONFIG_FILES([ Makefile libexif.spec libexif/Makefile - libexif/canon/Makefile - libexif/olympus/Makefile - libexif/pentax/Makefile test/Makefile test/nls/Makefile m4m/Makefile diff --git a/libexif/Makefile.am b/libexif/Makefile.am index d4683df..19cb29f 100644 --- a/libexif/Makefile.am +++ b/libexif/Makefile.am @@ -1,13 +1,16 @@ EXTRA_DIST = +lib_LTLIBRARIES = +noinst_LTLIBRARIES = -SUBDIRS = canon olympus pentax - -lib_LTLIBRARIES = libexif.la +include canon/Makefile-files +include olympus/Makefile-files +include pentax/Makefile-files # The -no-undefined makes it possible to build DLLs for Windows, # or shared libraries for Tru64 or AIX (according to the autobook # chapter on "Portable Library Design"). It doesn't seem to hurt # elsewhere, so we can leave it in. +lib_LTLIBRARIES += libexif.la libexif_la_LDFLAGS = \ -export-symbols $(srcdir)/libexif.sym \ -no-undefined -version-info @LIBEXIF_VERSION_INFO@ @@ -28,24 +31,15 @@ libexif_la_SOURCES = \ i18n.h libexif_la_DEPENDENCIES = \ $(srcdir)/libexif.sym \ - canon/libmnote-canon.la \ - olympus/libmnote-olympus.la \ - pentax/libmnote-pentax.la + libmnote-canon.la \ + libmnote-olympus.la \ + libmnote-pentax.la libexif_la_LIBADD = \ $(MATHLIBS) \ $(LTLIBINTL) \ - canon/libmnote-canon.la \ - olympus/libmnote-olympus.la \ - pentax/libmnote-pentax.la - -canon/libmnote-canon.la: - cd canon && $(MAKE) libmnote-canon.la - -olympus/libmnote-olympus.la: - cd olympus && $(MAKE) libmnote-olympus.la - -pentax/libmnote-pentax.la: - cd pentax && $(MAKE) libmnote-pentax.la + libmnote-canon.la \ + libmnote-olympus.la \ + libmnote-pentax.la libexifincludedir = $(includedir)/libexif libexifinclude_HEADERS = \ @@ -69,4 +63,3 @@ EXTRA_DIST += exif-system.h EXTRA_DIST += libexif.sym DISTCLEANFILES = _stdint.h - diff --git a/libexif/canon/Makefile-files b/libexif/canon/Makefile-files new file mode 100644 index 0000000..ef7ee2b --- /dev/null +++ b/libexif/canon/Makefile-files @@ -0,0 +1,7 @@ +# -*- Makefile -*- +noinst_LTLIBRARIES += libmnote-canon.la +libmnote_canon_la_SOURCES = \ + canon/exif-mnote-data-canon.c canon/exif-mnote-data-canon.h \ + canon/mnote-canon-entry.c canon/mnote-canon-entry.h \ + canon/mnote-canon-tag.c canon/mnote-canon-tag.h +libmnote_canon_la_LIBADD = $(LTLIBINTL) diff --git a/libexif/canon/Makefile.am b/libexif/canon/Makefile.am deleted file mode 100644 index 5c2ad2f..0000000 --- a/libexif/canon/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LTLIBRARIES = libmnote-canon.la -libmnote_canon_la_SOURCES = \ - exif-mnote-data-canon.c exif-mnote-data-canon.h \ - mnote-canon-entry.c mnote-canon-entry.h \ - mnote-canon-tag.c mnote-canon-tag.h -libmnote_canon_la_LIBADD = $(LTLIBINTL) diff --git a/libexif/olympus/Makefile-files b/libexif/olympus/Makefile-files new file mode 100644 index 0000000..b7b6b30 --- /dev/null +++ b/libexif/olympus/Makefile-files @@ -0,0 +1,7 @@ +# -*- Makefile -*- +noinst_LTLIBRARIES += libmnote-olympus.la +libmnote_olympus_la_SOURCES = \ + olympus/mnote-olympus-entry.c olympus/mnote-olympus-entry.h \ + olympus/exif-mnote-data-olympus.c olympus/exif-mnote-data-olympus.h \ + olympus/mnote-olympus-tag.c olympus/mnote-olympus-tag.h +libmnote_olympus_la_LIBADD = $(LTLIBINTL) diff --git a/libexif/olympus/Makefile.am b/libexif/olympus/Makefile.am deleted file mode 100644 index a05b1cd..0000000 --- a/libexif/olympus/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LTLIBRARIES = libmnote-olympus.la -libmnote_olympus_la_SOURCES = \ - mnote-olympus-entry.c mnote-olympus-entry.h \ - exif-mnote-data-olympus.c exif-mnote-data-olympus.h \ - mnote-olympus-tag.c mnote-olympus-tag.h -libmnote_olympus_la_LIBADD = $(LTLIBINTL) diff --git a/libexif/pentax/Makefile-files b/libexif/pentax/Makefile-files new file mode 100644 index 0000000..bcc0ac5 --- /dev/null +++ b/libexif/pentax/Makefile-files @@ -0,0 +1,7 @@ +# -*- Makefile -*- +noinst_LTLIBRARIES += libmnote-pentax.la +libmnote_pentax_la_SOURCES = \ + pentax/mnote-pentax-entry.c pentax/mnote-pentax-entry.h \ + pentax/exif-mnote-data-pentax.c pentax/exif-mnote-data-pentax.h \ + pentax/mnote-pentax-tag.c pentax/mnote-pentax-tag.h +libmnote_pentax_la_LIBADD = $(LTLIBINTL) diff --git a/libexif/pentax/Makefile.am b/libexif/pentax/Makefile.am deleted file mode 100644 index 6e643b6..0000000 --- a/libexif/pentax/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LTLIBRARIES = libmnote-pentax.la -libmnote_pentax_la_SOURCES = \ - mnote-pentax-entry.c mnote-pentax-entry.h \ - exif-mnote-data-pentax.c exif-mnote-data-pentax.h \ - mnote-pentax-tag.c mnote-pentax-tag.h -libmnote_pentax_la_LIBADD = $(LTLIBINTL) -- 2.34.1