Glade files are now installed at GLABELS_GLADE_DIR.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@350 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/Makefile.am b/glabels2/src/Makefile.am
index e6e10aa212f6838ed260d0a2dcb3c02b08d56367..ee2494a66857ce69053c142e44d6bb322fbf909d 100644 (file)
--- a/glabels2/src/Makefile.am
+++ b/glabels2/src/Makefile.am
@@ -5,23 +5,25 @@ SUBDIRS= pixmaps stock-pixmaps mygal recent-files
 bin_PROGRAMS = glabels glabels-batch
 
 uidir = $(datadir)/glabels/ui/
+gladedir = $(datadir)/glabels/glade/
 
 
 INCLUDES = \
-       -I$(top_srcdir)                                 \
-       -I$(top_builddir)                               \
-       $(GLABELS_CFLAGS)                               \
-       -I$(LIB_BARCODE_DIR)                            \
-       -DPREFIX=\""$(prefix)"\"                        \
-       -DSYSCONFDIR=\""$(sysconfdir)"\"                \
-       -DDATADIR=\""$(datadir)"\"                      \
-       -DLIBDIR=\""$(libdir)"\"                        \
-       -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\"     \
-       -DGLABELS_UI_DIR=\""$(datadir)/glabels/ui/"\"   \
-       -DG_DISABLE_DEPRECATED                          \
-       -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_DEPRECATED                        \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+       -I$(top_srcdir)                                         \
+       -I$(top_builddir)                                       \
+       $(GLABELS_CFLAGS)                                       \
+       -I$(LIB_BARCODE_DIR)                                    \
+       -DPREFIX=\""$(prefix)"\"                                \
+       -DSYSCONFDIR=\""$(sysconfdir)"\"                        \
+       -DDATADIR=\""$(datadir)"\"                              \
+       -DLIBDIR=\""$(libdir)"\"                                \
+       -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\"             \
+       -DGLABELS_UI_DIR=\""$(datadir)/glabels/ui/"\"           \
+       -DGLABELS_GLADE_DIR=\""$(datadir)/glabels/glade/"\"     \
+       -DG_DISABLE_DEPRECATED                                  \
+       -DGDK_DISABLE_DEPRECATED                                \
+       -DGTK_DISABLE_DEPRECATED                                \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED                         \
        -DGNOME_DISABLE_DEPRECATED                      
 
 glabels_LDFLAGS = -export-dynamic
@@ -96,25 +98,15 @@ glabels_SOURCES =                   \
        object-editor.h                 \
        object-editor-private.h         \
        object-editor-position-page.c   \
-       object-editor-position-page.h   \
        object-editor-size-page.c       \
-       object-editor-size-page.h       \
        object-editor-lsize-page.c      \
-       object-editor-lsize-page.h      \
        object-editor-line-page.c       \
-       object-editor-line-page.h       \
        object-editor-fill-page.c       \
-       object-editor-fill-page.h       \
        object-editor-image-page.c      \
-       object-editor-image-page.h      \
        object-editor-text-page.c       \
-       object-editor-text-page.h       \
        object-editor-edit-page.c       \
-       object-editor-edit-page.h       \
        object-editor-bc-page.c         \
-       object-editor-bc-page.h         \
        object-editor-data-page.c       \
-       object-editor-data-page.h       \
        print.c                         \
        print.h                         \
        print-dialog.c                  \
@@ -260,10 +252,16 @@ marshal.c: marshal.list $(GLIB_GENMARSHAL)
        echo "#include \"marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) $< --body --prefix=gl_marshal >> $@
 
-ui_DATA = glabels-ui.xml
+ui_DATA = \
+       glabels-ui.xml
+
+glade_DATA = \
+       object-editor.glade             \
+       prefs-dialog.glade
 
 EXTRA_DIST = \
        $(ui_DATA)                      \
+       $(glade_DATA)                   \
        marshal.list                    
 
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/glabels2/src/object-editor.c b/glabels2/src/object-editor.c
index d0e84f0aa8906ffa1d741faf5b09e7c122bf9fad..e979d4f44c60a9f9762c58682ff84ecdfaddcaa9 100644 (file)
--- a/glabels2/src/object-editor.c
+++ b/glabels2/src/object-editor.c
@@ -128,7 +128,7 @@ gl_object_editor_init (glObjectEditor *editor)
        
        editor->priv = g_new0 (glObjectEditorPrivate, 1);
 
-       editor->priv->gui = glade_xml_new ("object-editor.glade",
+       editor->priv->gui = glade_xml_new (GLABELS_GLADE_DIR "object-editor.glade",
                                           "editor_vbox",
                                           NULL);
 

diff --git a/glabels2/src/prefs-dialog.c b/glabels2/src/prefs-dialog.c
index 4032712a7b1e92d1b33904e995c2e330a484d5e6..e24d87c1155deb9b6b09bf7a6ea90c751aa6aa52 100644 (file)
--- a/glabels2/src/prefs-dialog.c
+++ b/glabels2/src/prefs-dialog.c
@@ -157,7 +157,7 @@ gl_prefs_dialog_init (glPrefsDialog *dlg)
 
        dlg->priv = g_new0 (glPrefsDialogPrivate, 1);
 
-       dlg->priv->gui = glade_xml_new ("prefs-dialog.glade",
+       dlg->priv->gui = glade_xml_new (GLABELS_GLADE_DIR "prefs-dialog.glade",
                                        "prefs_notebook",
                                        NULL);