summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTristan Van Berkom <tvb@src.gnome.org>2007-01-25 19:29:08 +0000
committerTristan Van Berkom <tvb@src.gnome.org>2007-01-25 19:29:08 +0000
commita769fa158c395de958e83162742e29fb26f50728 (patch)
tree01b49385d72cb432a2efb85b7f0630e876406987 /data
parent3c5eb7fa33cb948916adf81bf3df08eb7d8f6c20 (diff)
downloadglade-a769fa158c395de958e83162742e29fb26f50728.tar.gz
fixed conditionally building gnome & python.
* Makefile.am, configure.ac, plugins/Makefile.am, bindings/Makefile.am: fixed conditionally building gnome & python. * data/libgladeui-1.0.pc.in: Renamed to gladeui-1.0.pc.in. Updated for change in location of header files. * gladeui/glade.h, gladeui/glade-xml-utils.c: Cleaned up 'glade.h'. - Moved GLADE_TAG_* defines to glade-xml-utils.h. - Nuked GLADE_GENERIC_BORDER_WIDTH. * gladeui/*.h, plugins/gtk+/glade-gtk.[ch], plugins/gnome/glade-gnome.ch, bindings/python/*.[ch]: Changed header files location for libgladeui. svn path=/trunk/; revision=1054
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am4
-rw-r--r--data/gladeui-1.0.pc.in (renamed from data/libgladeui-1.0.pc.in)2
2 files changed, 3 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index cc6cb98d..79407078 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,11 +8,11 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgladeui-1.0.pc
+pkgconfig_DATA = gladeui-1.0.pc
EXTRA_DIST = \
$(desktop_in_files) \
- libgladeui-1.0.pc.in
+ gladeui-1.0.pc.in
CLEANFILES = \
$(desktop_DATA) \
diff --git a/data/libgladeui-1.0.pc.in b/data/gladeui-1.0.pc.in
index fa759086..fcd5841f 100644
--- a/data/libgladeui-1.0.pc.in
+++ b/data/gladeui-1.0.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
datarootdir=@datarootdir@
datadir=@datadir@
-includedir=@includedir@/libgladeui-1.0/libgladeui
+includedir=@includedir@/libgladeui-1.0
catalogdir=@datadir@/@PACKAGE@/catalogs
pixmapdir=@datadir@/@PACKAGE@/pixmaps
moduledir=@libdir@/@PACKAGE@/modules