[Monodevelop-patches-list] r2535 - trunk/MonoDevelop/Core/src/MonoDevelop.Base

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-05-15 17:10:29 -0400 (Sun, 15 May 2005)
New Revision: 2535

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
Log:
clean up, and still pass distcheck


Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-05-15 20:39:05 UTC (rev 2534)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-05-15 21:10:29 UTC (rev 2535)
@@ -1,3 +1,4 @@
+PERL = perl
 
 DLLS = /r:System.Drawing /r:ICSharpCode.SharpZipLib.dll \
 	/r:$(top_builddir)/build/bin/ICSharpCode.SharpRefactory.dll \
@@ -487,12 +488,14 @@
 	mkdir -p $(ADDIN_BUILD)
 	cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/.
 
-$(ASSEMBLY): $(build_sources) $(srcdir)/Base.glade
-	mkdir -p $(top_builddir)/Core/src/MonoDevelop.Base/Services 
-	perl  -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/./Services/process-icons.pl > $(top_builddir)/Core/src/MonoDevelop.Base/Services/StockIcons.cs
+Services/StockIcons.cs: $(srcdir)/Services/process-icons.pl $(srcdir)/../../../build/data/resources/icons
+	mkdir -p Services
+	$(PERL) -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/Services/process-icons.pl > Services/StockIcons.cs
+
+$(ASSEMBLY): $(build_sources) $(srcdir)/Base.glade Services/StockIcons.cs
 	$(CSC) $(MONO_POSIX_OEE) -codepage:utf8 -out:$@ -target:library $(DLLS) \
 		-resource:$(srcdir)/Base.glade,Base.glade \
-		$(monodoc_libflags) $(build_sources) $(top_builddir)/Core/src/MonoDevelop.Base/Services/StockIcons.cs \
+		$(monodoc_libflags) $(build_sources) Services/StockIcons.cs \
 	&& cp $(CONFIG) $(top_builddir)/build/bin/.
 
 assemblydir = $(MD_ASSEMBLY_DIR)
@@ -504,8 +507,8 @@
 optionsdir = $(MD_DIR)/data/options
 options_DATA = $(OPTIONS)
 
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_OPTIONS) $(top_builddir)/Core/src/MonoDevelop.Base/Services/StockIcons.cs
-DISTCLEANFILES = $(CONFIG)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_OPTIONS)
+DISTCLEANFILES = $(CONFIG) Services/StockIcons.cs
 
 EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(CONFIG).in Base.glade $(ADDIN) $(OPTIONS)