diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-05-31 09:34:22 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-05-31 09:34:22 +0400 |
| commit | 4f075b54865d1f526dd9cea174caa1d693e0f7e6 (patch) | |
| tree | eebf808e33df873931f2c59cade233c3bc5af547 /asn1view | |
| parent | 6c0db26e0f2b2d4cd94cfa970d377f603a4b01ad (diff) | |
* gtk/Makefile.am (gasnview): Depend on script.in. Depend on
Makefile to pick up any change in $(prefix).
(gasnview_sources): Prefix Main.cs with $(srcdir) like the rest.
(gasnview_sources_build): Don't add $(srcdir) prefix to
$(gasnview_source), they already have it.
svn path=/trunk/mono-tools/; revision=45233
Diffstat (limited to 'asn1view')
| -rw-r--r-- | asn1view/ChangeLog | 8 | ||||
| -rw-r--r-- | asn1view/gtk/Makefile.am | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/asn1view/ChangeLog b/asn1view/ChangeLog index 6144c5ec..e74ae1fd 100644 --- a/asn1view/ChangeLog +++ b/asn1view/ChangeLog @@ -1,3 +1,11 @@ +2005-05-31 Raja R Harinath <rharinath@novell.com> + + * gtk/Makefile.am (gasnview): Depend on script.in. Depend on + Makefile to pick up any change in $(prefix). + (gasnview_sources): Prefix Main.cs with $(srcdir) like the rest. + (gasnview_sources_build): Don't add $(srcdir) prefix to + $(gasnview_source), they already have it. + 2005-05-08 Ben Maurer <bmaurer@ximian.com> * gtk/Makefile.am, gtk/script.in: use @RUNTIME@ rather than diff --git a/asn1view/gtk/Makefile.am b/asn1view/gtk/Makefile.am index 24499ff9..92a1cf27 100644 --- a/asn1view/gtk/Makefile.am +++ b/asn1view/gtk/Makefile.am @@ -21,7 +21,7 @@ resources = $(srcdir)/gui.glade \ $(srcdir)/../art/text_hilight-16.png \ $(srcdir)/../art/text_lolight-16.png -gasnview_sources = Main.cs \ +gasnview_sources = $(srcdir)/Main.cs \ $(srcdir)/../common/ASN1Decoder.cs \ $(srcdir)/../common/PrettyPrinter.cs \ $(srcdir)/../common/OidCache.cs \ @@ -29,15 +29,14 @@ gasnview_sources = Main.cs \ gasnview_sources_in = gasnview_sources_dist = $(gasnview_sources) $(gasnview_sources_in) -gasnview_sources_build = $(addprefix $(srcdir)/, $(gasnview_sources)) -gasnview_sources_build += $(gasnview_sources_in:.in=) +gasnview_sources_build = $(gasnview_sources) $(gasnview_sources_in:.in=) ### ress= $(foreach res,$(resources), $(addprefix -resource:,$(res)),$(notdir $(res))) gasnview.exe: $(gasnview_sources_build) $(resources) $(MCS) $(MCSFLAGS) $(local_flags) $(ress) -out:$@ $(gasnview_sources_build) - + scriptdir = $(bindir) script_SCRIPTS = gasnview @@ -48,6 +47,6 @@ REWRITE = sed \ -e 's,@''exe_file@,$@.exe,g' \ -e 's,@''RUNTIME@,@RUNTIME@,g' -gasnview : +gasnview: $(srcdir)/script.in Makefile $(REWRITE) $(srcdir)/script.in > $@.tmp mv $@.tmp $@ |