[glade3/glade-3-8] * gladeui/Makefile.am, gladeui/glade-project.c: Changed glade-previewer install name to glade-3-
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3/glade-3-8] * gladeui/Makefile.am, gladeui/glade-project.c: Changed glade-previewer install name to glade-3-
- Date: Wed, 29 Dec 2010 11:47:44 +0000 (UTC)
commit b05518e3f04ceac9056548868ebffedbdcc8a48d
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Wed Dec 29 20:54:01 2010 +0900
* gladeui/Makefile.am, gladeui/glade-project.c: Changed glade-previewer install name
to glade-3-previewer, reserving the former name for parallel installable 3.10.
ChangeLog | 3 +++
gladeui/Makefile.am | 16 ++++++++--------
gladeui/glade-project.c | 4 ++--
3 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index aea4579..dc06a07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
* gladeui/glade-design-view.c: Made loading progress bar nicer looking and ellipsizing.
+ * gladeui/Makefile.am, gladeui/glade-project.c: Changed glade-previewer install name
+ to glade-3-previewer, reserving the former name for parallel installable 3.10.
+
2010-12-28 Tristan Van Berkom <tristanvb openismus com>
* gladeui/Makefile.am, gladeui/glade.h, gladeui/glade-clipboard.c, gladeui/glade-app.[ch],
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 70d0834..aea3df9 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -1,9 +1,9 @@
## Previewer
-bin_PROGRAMS = glade-previewer
+bin_PROGRAMS = glade-3-previewer
lib_LTLIBRARIES = libgladeui-1.la
-glade_previewer_CPPFLAGS = \
+glade_3_previewer_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
@@ -12,20 +12,20 @@ glade_previewer_CPPFLAGS = \
$(WARN_CFLAGS) \
$(AM_CPPFLAGS)
-glade_previewer_CFLAGS = \
+glade_3_previewer_CFLAGS = \
$(AM_CFLAGS)
-glade_previewer_LDFLAGS = $(AM_LDFLAGS)
+glade_3_previewer_LDFLAGS = $(AM_LDFLAGS)
-glade_previewer_LDADD = libgladeui-1.la $(IGE_MAC_LIBS)
+glade_3_previewer_LDADD = libgladeui-1.la $(IGE_MAC_LIBS)
-glade_previewer_SOURCES = \
+glade_3_previewer_SOURCES = \
glade-previewer.c
if NATIVE_WIN32
-glade_previewer_LDADD += glade-win32-res.o
+glade_3_previewer_LDADD += glade-win32-res.o
if !GLADE_UNSTABLE
-glade_previewer_LDFLAGS += -mwindows
+glade_3_previewer_LDFLAGS += -mwindows
endif
endif
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index a3ef835..b469d19 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -1987,9 +1987,9 @@ glade_project_launch_preview (GladeProject *project, gchar *buffer, GtkWidget *w
#ifdef WINDOWS
- argv[0] = g_build_filename (glade_app_get_bin_dir(), "glade-previewer.exe", NULL);
+ argv[0] = g_build_filename (glade_app_get_bin_dir(), "glade-3-previewer.exe", NULL);
#else
- argv[0] = g_build_filename (glade_app_get_bin_dir(), "glade-previewer", NULL);
+ argv[0] = g_build_filename (glade_app_get_bin_dir(), "glade-3-previewer", NULL);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]