[f-spot] fix includes



commit 50aad76ce0dd277ef45ecc97212f558c95a22210
Author: Stephane Delcroix <stephane delcroix org>
Date:   Fri Nov 6 14:36:33 2009 +0100

    fix includes

 Makefile.addins                                    |    6 ++++--
 extensions/Tools/ChangePhotoPath/Makefile.am       |    2 +-
 extensions/Tools/DevelopInUFraw/Makefile.am        |    2 +-
 extensions/Tools/HashJob/Makefile.am               |    2 +-
 extensions/Tools/LiveWebGallery/Makefile.am        |    2 +-
 extensions/Tools/MergeDb/Makefile.am               |    2 +-
 extensions/Tools/RawPlusJpeg/Makefile.am           |    2 +-
 extensions/Tools/ScreensaverConfig/Makefile.am     |    2 +-
 extensions/Transitions/CoverTransition/Makefile.am |    2 +-
 9 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.addins b/Makefile.addins
index 38291fc..ee7973b 100644
--- a/Makefile.addins
+++ b/Makefile.addins
@@ -23,11 +23,13 @@ build_references =					\
 	$(LINK_GTKSHARPBEANS)
 
 
-all: $(ASSEMBLY)
 mpack: $(ASSEMBLY)
 	mautil p $(ASSEMBLY)
 
-$(ASSEMBLY): $(build_sources) $(dep_resources)
+addin_SOURCES =						\
+	$(build_sources)
+
+$(ASSEMBLY): $(addin_SOURCES) $(dep_resources)
 	$(CSC_LIB) -out:$@ $(addin_extraflags) $(build_sources) $(build_references) $(build_packages) $(build_resources)
 
 addindir = $(pkglibdir)/extensions
diff --git a/extensions/Tools/ChangePhotoPath/Makefile.am b/extensions/Tools/ChangePhotoPath/Makefile.am
index c2f1599..86a7386 100755
--- a/extensions/Tools/ChangePhotoPath/Makefile.am
+++ b/extensions/Tools/ChangePhotoPath/Makefile.am
@@ -21,4 +21,4 @@ addin_packages =			\
 addin_extradist =			\
 	ChangePhotoPath.glade
 
-include $(top_builddir)/Makefile.addins
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/DevelopInUFraw/Makefile.am b/extensions/Tools/DevelopInUFraw/Makefile.am
index 157dabf..1880cd8 100644
--- a/extensions/Tools/DevelopInUFraw/Makefile.am
+++ b/extensions/Tools/DevelopInUFraw/Makefile.am
@@ -16,4 +16,4 @@ addin_packages =			\
 
 addin_extradist =
 
-include $(top_builddir)/Makefile.addins
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/HashJob/Makefile.am b/extensions/Tools/HashJob/Makefile.am
index d32c37f..b936065 100644
--- a/extensions/Tools/HashJob/Makefile.am
+++ b/extensions/Tools/HashJob/Makefile.am
@@ -17,4 +17,4 @@ addin_packages =			\
 
 addin_extra_dist =
 
-include $(top_builddir)/Makefile.addins
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/LiveWebGallery/Makefile.am b/extensions/Tools/LiveWebGallery/Makefile.am
index adcc47c..74eeea2 100644
--- a/extensions/Tools/LiveWebGallery/Makefile.am
+++ b/extensions/Tools/LiveWebGallery/Makefile.am
@@ -30,4 +30,4 @@ addin_packages =			\
 
 addin_extradist =
 
-include $(top_builddir)/Makefile.addins
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/MergeDb/Makefile.am b/extensions/Tools/MergeDb/Makefile.am
index 4e13a91..a59b482 100644
--- a/extensions/Tools/MergeDb/Makefile.am
+++ b/extensions/Tools/MergeDb/Makefile.am
@@ -20,5 +20,5 @@ addin_packages =			\
 
 addin_extradist =
 
-include $(top_builddir)/Makefile.addins
+include $(top_srcdir)/Makefile.addins
 
diff --git a/extensions/Tools/RawPlusJpeg/Makefile.am b/extensions/Tools/RawPlusJpeg/Makefile.am
index 59ea49c..876e527 100644
--- a/extensions/Tools/RawPlusJpeg/Makefile.am
+++ b/extensions/Tools/RawPlusJpeg/Makefile.am
@@ -17,4 +17,4 @@ addin_packages =			\
 
 addin_extradist =
 
-include $(top_builddir)/Makefile.addins
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Tools/ScreensaverConfig/Makefile.am b/extensions/Tools/ScreensaverConfig/Makefile.am
index 2a214f2..6840e5a 100644
--- a/extensions/Tools/ScreensaverConfig/Makefile.am
+++ b/extensions/Tools/ScreensaverConfig/Makefile.am
@@ -16,4 +16,4 @@ addin_packages =			\
 
 addin_extradist =
 
-include $(top_builddir)/Makefile.addins
+include $(top_srcdir)/Makefile.addins
diff --git a/extensions/Transitions/CoverTransition/Makefile.am b/extensions/Transitions/CoverTransition/Makefile.am
index 52cfac7..db79db3 100644
--- a/extensions/Transitions/CoverTransition/Makefile.am
+++ b/extensions/Transitions/CoverTransition/Makefile.am
@@ -16,4 +16,4 @@ addin_packages =			\
 
 addin_extradist =
 
-include $(top_builddir)/Makefile.addins
+include $(top_srcdir)/Makefile.addins



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]