Use the correct way to define paths, using _CPPFLAGS in Makefile.am. Fixes

2007-01-03  Christian Persch  <chpe@svn.gnome.org>

	* configure.in:
	* glade-3.desktop.in:
	* pixmaps/16x16/Makefile.am:
	* pixmaps/22x22/Makefile.am:
	* pixmaps/Makefile.am:
	* src/Makefile.am:
	* src/glade-app.c:
	* src/glade-binding.c:
	* src/glade-paths.sh.in:
	* src/glade-project-window.c:
	* src/libgladeui-1.0.pc.in:
	* widgets/Makefile.am:
	Use the correct way to define paths, using _CPPFLAGS in Makefile.am.
	Fixes build problem with autoconf 2.60 wrt. datarootdir. Bug #392379.

svn path=/trunk/; revision=1031

6 files changed, 52 insertions, 79 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9cb35f2d..b439dd00 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,24 @@
-## Process this file with automake to produce Makefile.in
 SUBDIRS=
 
+common_defines = \
+	-DGLADE_DATADIR="\"$(pkgdatadir)\""		\
+	-DGLADE_LIBDIR="\"$(pkglibdir)\""		\
+	-DGLADE_CATALOGSDIR="\"$(pkgdatadir)/catalogs\""\
+	-DGLADE_MODULESDIR="\"$(pkglibdir)/modules\""	\
+	-DGLADE_PLUGINSDIR="\"$(pkglibdir)/plugins\""	\
+	-DGLADE_BINDINGSDIR="\"$(pkglibdir)/bindings\""	\
+	-DGLADE_PIXMAPSDIR="\"$(pkgdatadir)/pixmaps\""	\
+	-DGLADE_SCRIPTSDIR="\"$(pkgdatadir)/scripts\""	\
+	-DGLADE_ICONDIR="\"$(datadir)/pixmaps\""	\
+	-DGLADE_LOCALEDIR="\"$(datadir)/locale\""	\
+	-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
 
 bin_PROGRAMS = glade-3
 lib_LTLIBRARIES = libgladeui-1.la
 
 BUILT_SOURCES = \
         glade-marshallers.c \
-        glade-marshallers.h \
-	glade-paths.h
+        glade-marshallers.h
 
 CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = glade-marshallers.list
@@ -16,36 +26,47 @@ EXTRA_DIST = glade-marshallers.list
 
 # The main application code
 #
-glade_3_CFLAGS =           \
-	-g -Wall           \
+glade_3_CPPFLAGS = \
+	$(common_defines)  \
 	-I$(top_srcdir)    \
 	-I$(top_builddir)  \
-	$(GTK_CFLAGS)
+	$(AM_CPPFLAGS)
+
+glade_3_CFLAGS =           \
+	-g -Wall           \
+	$(GTK_CFLAGS)      \
+	$(AM_CFLAGS)
+
+glade_3_LDFLAGS = \
+	$(AM_LDFLAGS)
 
 glade_3_LDADD = libgladeui-1.la
+
 glade_3_SOURCES = \
 	glade-project-window.c glade-project-window.h \
 	main.c
 
-glade_3_LDFLAGS =
-
 if WITH_WIN32
 glade_3_LDFLAGS += -mwindows
 endif
 
 # The GTK catalog backend
 gladegtk_LTLIBRARIES = libgladegtk.la
-gladegtkdir = $(glade_modulesdir)
+gladegtkdir = $(pkglibdir)/modules
 
+libgladegtk_la_CPPLAGS =   \
+	$(common_defines)  \
+	-I$(top_srcdir)    \
+	-I$(top_builddir)  \
+	$(AM_CPPFLAGS)
 
 libgladegtk_la_CFLAGS =    \
 	-g -Wall           \
-	-I$(top_srcdir)    \
-	-I$(top_builddir)  \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS)	   \
+	$(AM_CFLAGS)
 
 libgladegtk_la_SOURCES     = glade-gtk.c
-libgladegtk_la_LDFLAGS     = -module -avoid-version
+libgladegtk_la_LDFLAGS     = -module -avoid-version $(AM_LDFLAGS)
 libgladegtk_la_LIBADD      = libgladeui-1.la $(GTK_LIBS)
 libgladegtkincludedir      = $(includedir)/libgladeui-1.0/libgladeui
 libgladegtkinclude_HEADERS = glade-gtk.h
@@ -91,14 +112,19 @@ libgladeui_1_la_SOURCES = \
 	glade-binding.c \
 	glade-base-editor.c
 
-libgladeui_1_la_CFLAGS =    \
+libgladeui_1_la_CPPFLAGS =  \
 	-DINSIDE_LIBGLADEUI \
-	-g -Wall            \
+	$(common_defines)   \
 	-I$(top_srcdir)     \
 	-I$(top_builddir)   \
-	$(GTK_CFLAGS)
+	$(AM_CPPFLAGS)
 
-libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE)
+libgladeui_1_la_CFLAGS =    \
+	-g -Wall            \
+	$(GTK_CFLAGS)       \
+	$(AM_CFLAGS)
+
+libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
 libgladeui_1_la_LIBADD = $(GTK_LIBS)
 
 libgladeuiincludedir=$(includedir)/libgladeui-1.0/libgladeui
@@ -149,20 +175,22 @@ pkgconfig_DATA = libgladeui-1.0.pc
 
 if BUILD_PYTHON
 gladepython_LTLIBRARIES = libgladepython.la
-gladepythondir = $(glade_bindingsdir)
+gladepythondir = $(pkglibdir)/bindings
 libgladepython_la_SOURCES = glade-python.c glade-python-gwa.c
-libgladepython_la_CFLAGS = -g -Wall $(PYTHON_CFLAGS) $(GTK_CFLAGS)
-libgladepython_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS)
+libgladepython_la_CPPFLAGS = $(common_defines) $(AM_CPPFLAGS)
+libgladepython_la_CFLAGS = -g -Wall $(PYTHON_CFLAGS) $(GTK_CFLAGS) $(AM_CFLAGS)
+libgladepython_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS)
 libgladepython_la_LIBADD = libgladeui-1.la $(PYTHON_LIBS)
 
 endif
 
 if BUILD_GNOME
 gladegnome_LTLIBRARIES = libgladegnome.la
-gladegnomedir = $(glade_modulesdir)
+gladegnomedir = $(pkglibdir)/modules
 libgladegnome_la_SOURCES = glade-gnome.c
-libgladegnome_la_CFLAGS = -g -Wall $(GNOME_CFLAGS)
-libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS)
+libgladegnome_la_CPPFLAGS = $(common_defines) $(AM_CPPFLAGS)
+libgladegnome_la_CFLAGS = -g -Wall $(GNOME_CFLAGS) $(AM_CPPFLAGS)
+libgladegnome_la_LDFLAGS = -module -avoid-version $(GNOME_LIBS) $(AM_LDFLAGS)
 libgladegnome_la_LIBADD = libgladeui-1.la $(GLADE_LIBS)
 endif
 
@@ -191,11 +219,3 @@ glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body > glade-marshallers-c.tmp     \
 	&& mv glade-marshallers-c.tmp glade-marshallers.c \
 	|| ( rm -f glade-marshallers-c.tmp && exit 1 )
-
-glade-paths.h: glade-paths.sh
-	@sh $< > $@.tmp ;					\
-	if cmp -s $@.tmp $@; then				\
-	    rm $@.tmp;						\
-	else							\
-	    mv $@.tmp $@ ; echo updated glade-paths.h ;	\
-	fi
diff --git a/src/glade-app.c b/src/glade-app.c
index a6679309..84aa6205 100644
--- a/src/glade-app.c
+++ b/src/glade-app.c
@@ -34,7 +34,6 @@
 #include "glade-debug.h"
 #include "glade-cursor.h"
 #include "glade-catalog.h"
-#include "glade-paths.h"
 #include "glade-fixed.h"
 #include "glade-binding.h"
 
diff --git a/src/glade-binding.c b/src/glade-binding.c
index 47aea4ea..976d7f0c 100644
--- a/src/glade-binding.c
+++ b/src/glade-binding.c
@@ -26,7 +26,6 @@
 
 #include "glade.h"
 #include "glade-binding.h"
-#include "glade-paths.h"
 #include <string.h>
 
 /*
diff --git a/src/glade-paths.sh.in b/src/glade-paths.sh.in
deleted file mode 100755
index 3134a1ff..00000000
--- a/src/glade-paths.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -e
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-sysconfdir="@sysconfdir@"
-datadir="@datadir@"
-libdir="@libdir@"
-
-PACKAGE="@PACKAGE@"
-DATADIRNAME="@DATADIRNAME@"
-
-glade_version="@glade_version@"
-glade_datadir="@glade_datadir@"
-glade_libdir="@glade_libdir@"
-glade_catalogsdir="@glade_catalogsdir@"
-glade_modulesdir="@glade_modulesdir@"
-glade_pluginsdir="@glade_pluginsdir@"
-glade_bindingsdir="@glade_bindingsdir@"
-glade_pixmapsdir="@glade_pixmapsdir@"
-glade_scriptsdir="@glade_scriptsdir@"
-glade_icondir="@glade_icondir@"
-glade_gnomehelpdir="@HELP_DIR@"
-glade_localedir="@glade_localedir@"
-
-cat <<EOF
-/* This file has been automatically generated.  Do not edit. */
-
-#ifndef GLADE_PATHS_H
-#define GLADE_PATHS_H
-
-#define GLADE_VERSION "$glade_version"
-#define GLADE_DATADIR "$glade_datadir"
-#define GLADE_LIBDIR "$glade_libdir"
-#define GLADE_CATALOGSDIR "$glade_catalogsdir"
-#define GLADE_MODULESDIR "$glade_modulesdir"
-#define GLADE_PLUGINSDIR "$glade_pluginsdir"
-#define GLADE_BINDINGSDIR "$glade_bindingsdir"
-#define GLADE_PIXMAPSDIR "$glade_pixmapsdir"
-#define GLADE_SCRIPTSDIR "$glade_scriptsdir"
-#define GLADE_ICONDIR "$glade_icondir"
-#define GLADE_GNOMEHELPDIR "$glade_gnomehelpdir"
-#define GLADE_LOCALEDIR "$glade_localedir"
-
-#endif /* GLADE_PATHS_H */
-EOF
diff --git a/src/glade-project-window.c b/src/glade-project-window.c
index 4432979f..90eef5af 100644
--- a/src/glade-project-window.c
+++ b/src/glade-project-window.c
@@ -32,7 +32,6 @@
 #include <gtk/gtkstock.h>
 
 #include "glade.h"
-#include "glade-paths.h"
 #include "glade-design-view.h"
 #include "glade-project-window.h"
 #include "glade-binding.h"
diff --git a/src/libgladeui-1.0.pc.in b/src/libgladeui-1.0.pc.in
index 8e5faa56..fa759086 100644
--- a/src/libgladeui-1.0.pc.in
+++ b/src/libgladeui-1.0.pc.in
@@ -1,6 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
+datarootdir=@datarootdir@
 datadir=@datadir@
 includedir=@includedir@/libgladeui-1.0/libgladeui
 catalogdir=@datadir@/@PACKAGE@/catalogs