[blam] build: use automake to replace the constants in Define.cs
- From: Carlos Martín Nieto <cmartin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [blam] build: use automake to replace the constants in Define.cs
- Date: Fri, 14 Jun 2013 21:01:45 +0000 (UTC)
commit 3f6d90fa86b970a21d3cfab4b5e9f31a8ad3e3ea
Author: Carlos Martín Nieto <cmn dwim me>
Date: Fri Jun 14 14:34:08 2013 +0200
build: use automake to replace the constants in Define.cs
This is preferrable to a sed script, and lets distcheck get further.
configure.ac | 1 +
src/Defines.cs.in | 4 ++--
src/Makefile.am | 6 ------
3 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dc5713f..96c13dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,7 @@ icons/32x32/Makefile
icons/48x48/Makefile
icons/scalable/Makefile
src/Makefile
+src/Defines.cs
po/Makefile.in
blam.desktop.in
themes/Makefile
diff --git a/src/Defines.cs.in b/src/Defines.cs.in
index 2404992..6452d54 100644
--- a/src/Defines.cs.in
+++ b/src/Defines.cs.in
@@ -11,8 +11,8 @@ using System;
namespace Imendio.Blam {
public class Defines {
- public static string VERSION = "@version@";
- public static string DATADIR = "@datadir@";
+ public static string VERSION = "@VERSION@";
+ public static string DATADIR = "@prefix@/share";
public static string CODENAME = "@codename@";
public static string APP_DATADIR = DATADIR + "/blam";
public static string APP_HOMEDIR = Environment.GetEnvironmentVariable("HOME") + "/.gnome2/blam";
diff --git a/src/Makefile.am b/src/Makefile.am
index c795d2b..2d901fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,12 +57,6 @@ ASSEMBLIES += $(NOTIFY_LIBS)
endif
-Defines.cs: Defines.cs.in ../config.log
- sed -e "s|\ version\@|$(VERSION)|" \
- -e "s|\ datadir\@|$(datadir)|" \
- -e "s|\ codename\@|$(codename)|" \
- < $(top_srcdir)/src/Defines.cs.in > $(top_srcdir)/src/Defines.cs
-
blamlibdir = $(prefix)/lib/blam
blam.exe: $(BLAM_CSFILES) $(GENERATED_CSFILES) blam.glade
$(CSC) -unsafe $(FLAGS) -lib:$(top_srcdir)/lib $(RESOURCES) $(BLAM_LIBS) $(ASSEMBLIES)
$(BLAM_CSFILES) $(GENERATED_CSFILES) -out:$@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]