Author: raja
Date: 2006-11-06 06:15:05 -0500 (Mon, 06 Nov 2006)
New Revision: 67400
Modified:
trunk/heap-shot/ChangeLog
trunk/heap-shot/HeapShot.Gui.Widgets/Makefile.am
trunk/heap-shot/HeapShot.Gui/Makefile.am
trunk/heap-shot/HeapShot/Makefile.am
trunk/heap-shot/configure.in
Log:
* configure.in (HeapShot/heap-shot): Separate out output command.
Make generated file executable.
(HeapShot.Gui/heap-shot-gui): Likewise.
* HeapShot/Makefile.am: Remove custom makerule for heap-shot.
* HeapShot.Gui/Makefile.am: Remove custom makerule for heap-shot-gui.
* HeapShot.Gui.Widgets/Makefile.am (RES_CSFLAGS): New. Look for
resource files in the source directory.
($(TARGET)): Use it. Depend on resource files too.
Modified: trunk/heap-shot/ChangeLog
===================================================================
--- trunk/heap-shot/ChangeLog 2006-11-06 08:36:22 UTC (rev 67399)
+++ trunk/heap-shot/ChangeLog 2006-11-06 11:15:05 UTC (rev 67400)
@@ -1,3 +1,14 @@
+2006-11-06 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * configure.in (HeapShot/heap-shot): Separate out output command.
+ Make generated file executable.
+ (HeapShot.Gui/heap-shot-gui): Likewise.
+ * HeapShot/Makefile.am: Remove custom makerule for heap-shot.
+ * HeapShot.Gui/Makefile.am: Remove custom makerule for heap-shot-gui.
+ * HeapShot.Gui.Widgets/Makefile.am (RES_CSFLAGS): New. Look for
+ resource files in the source directory.
+ ($(TARGET)): Use it. Depend on resource files too.
+
2006-11-05 Lluis Sanchez Gual <[EMAIL PROTECTED]>
- Initial import of heap-shot.
\ No newline at end of file
+ Initial import of heap-shot.
Modified: trunk/heap-shot/HeapShot/Makefile.am
===================================================================
--- trunk/heap-shot/HeapShot/Makefile.am 2006-11-06 08:36:22 UTC (rev
67399)
+++ trunk/heap-shot/HeapShot/Makefile.am 2006-11-06 11:15:05 UTC (rev
67400)
@@ -17,10 +17,6 @@
$(TARGET): $(SRCDIR_CSFILES)
$(CSC) -out:$@ -r:../HeapShot.Reader/HeapShot.Reader.dll $(CSFLAGS) $^
-$(WRAPPER): $(srcdir)/$(WRAPPER).in
- sed -e "s|[EMAIL PROTECTED]@|$(pkglibdir)|g" < $(srcdir)/$(WRAPPER).in
> $@
- chmod +x $(WRAPPER)
-
all: $(TARGET) $(WRAPPER)
install-data-local: $(TARGET)
@@ -38,4 +34,4 @@
CLEANFILES = \
$(TARGET) \
$(TARGET).mdb \
- $(WRAPPER)
\ No newline at end of file
+ $(WRAPPER)
Modified: trunk/heap-shot/HeapShot.Gui/Makefile.am
===================================================================
--- trunk/heap-shot/HeapShot.Gui/Makefile.am 2006-11-06 08:36:22 UTC (rev
67399)
+++ trunk/heap-shot/HeapShot.Gui/Makefile.am 2006-11-06 11:15:05 UTC (rev
67400)
@@ -20,10 +20,6 @@
$(TARGET): $(SRCDIR_CSFILES)
$(CSC) -out:$@ $(CSFLAGS) $^
-$(WRAPPER): $(srcdir)/$(WRAPPER).in
- sed -e "s|[EMAIL PROTECTED]@|$(pkglibdir)|g" < $(srcdir)/$(WRAPPER).in
> $@
- chmod +x $(WRAPPER)
-
all: $(TARGET) $(WRAPPER)
install-data-local: $(TARGET)
@@ -41,4 +37,4 @@
CLEANFILES = \
$(TARGET) \
$(TARGET).mdb \
- $(WRAPPER)
\ No newline at end of file
+ $(WRAPPER)
Modified: trunk/heap-shot/HeapShot.Gui.Widgets/Makefile.am
===================================================================
--- trunk/heap-shot/HeapShot.Gui.Widgets/Makefile.am 2006-11-06 08:36:22 UTC
(rev 67399)
+++ trunk/heap-shot/HeapShot.Gui.Widgets/Makefile.am 2006-11-06 11:15:05 UTC
(rev 67400)
@@ -15,11 +15,11 @@
class.png \
field.png
-
SRCDIR_CSFILES = $(CSFILES:%=$(srcdir)/%)
+RES_CSFLAGS = $(foreach res, $(RES), -resource:$(srcdir)/$(res),$(res))
-$(TARGET): $(SRCDIR_CSFILES)
- $(CSC) -out:$@ $(CSFLAGS) $(RES:%=/resource:%) $^
+$(TARGET): $(SRCDIR_CSFILES) $(RES)
+ $(CSC) -out:$@ $(CSFLAGS) $(RES_CSFLAGS) $(SRCDIR_CSFILES)
all: $(TARGET)
Modified: trunk/heap-shot/configure.in
===================================================================
--- trunk/heap-shot/configure.in 2006-11-06 08:36:22 UTC (rev 67399)
+++ trunk/heap-shot/configure.in 2006-11-06 11:15:05 UTC (rev 67400)
@@ -10,14 +10,15 @@
pkglibdir=$prefix/lib/heapshot
AC_SUBST(pkglibdir)
+AC_CONFIG_FILES([HeapShot/heap-shot],[chmod +x HeapShot/heap-shot])
+AC_CONFIG_FILES([HeapShot.Gui/heap-shot-gui],[chmod +x
HeapShot.Gui/heap-shot-gui])
+
AC_OUTPUT([
Makefile
profiler/Makefile
HeapShot.Reader/Makefile
HeapShot.Gui.Widgets/Makefile
HeapShot.Gui/Makefile
-HeapShot.Gui/heap-shot-gui
-HeapShot/heap-shot
HeapShot/Makefile
])
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
