From ff047f4ed5f3fae2072505ca5b14d35a6e1bdea7 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 28 Jan 2003 18:17:04 +0000 Subject: Make this work with parallel make as well. svn path=/trunk/; revision=19671 --- shell/ChangeLog | 4 ++++ shell/importer/Makefile.am | 27 ++++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index ba2e9eadf7..cfbafb07ae 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,7 @@ +2003-01-28 Ettore Perazzoli + + * importer/Makefile.am: Make this work with parallel make as well. + 2003-01-28 Ettore Perazzoli * Makefile.am: Use a little trick for the IDL compilation so that diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am index d0fff6253e..94f532db3c 100644 --- a/shell/importer/Makefile.am +++ b/shell/importer/Makefile.am @@ -9,22 +9,34 @@ INCLUDES = \ privlib_LTLIBRARIES = libevolution-importer.la + +# IDL stuff + IDLS = GNOME_Evolution_Importer.idl -IDL_GENERATED = \ - GNOME_Evolution_Importer.h \ +IDL_GENERATED_H = \ + GNOME_Evolution_Importer.h + +IDL_GENERATED_C = \ GNOME_Evolution_Importer-common.c \ GNOME_Evolution_Importer-skels.c \ GNOME_Evolution_Importer-stubs.c +IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_C) + GNOME_Evolution_Importer-impl.o: GNOME_Evolution_Importer.h -$(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \ - $(srcdir)/GNOME_Evolution_Importer.idl +$(IDL_GENERATED_H): $(IDLS) + $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(srcdir)/GNOME_Evolution_Importer.idl + +$(IDL_GENERATED_C): $(IDL_GENERATED_H) + @true idl_DATA = $(IDLS) + +# Component + libevolution_importerincludedir = $(includedir)/evolution-$(BASE_VERSION)/importer libevolution_importer_la_SOURCES = \ $(IDL_GENERATED) \ @@ -51,8 +63,9 @@ glade_DATA = import.glade EXTRA_DIST = $(glade_DATA) $(IDLS) -BUILT_SOURCES=$(IDL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) +BUILT_SOURCES= $(IDL_GENERATED_H) +CLEANFILES = $(IDL_GENERATED) + dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) -- cgit