Commit e5cfac50 authored by Christian Persch's avatar Christian Persch Committed by Christian Persch
Browse files

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
parent 69075b5e
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.
2006-12-18 Tristan Van Berkom <tvb@gnome.org>
* configure.in, NEWS: Rolling 3.1.4
......
......@@ -5,9 +5,10 @@ AC_INIT(glade3, 3.1.4,
http://bugzilla.gnome.org/enter_bug.cgi?product=glade3)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
......@@ -149,31 +150,10 @@ AM_CONDITIONAL(WITH_WIN32, test x"$win32" = "xyes")
AC_PROG_CXX
dnl ================================================================
dnl Misc substitutions
dnl ================================================================
glade_version="${VERSION}"
glade_datadir='${datadir}/${PACKAGE}'
glade_libdir='${libdir}/${PACKAGE}'
glade_catalogsdir='${glade_datadir}/catalogs'
glade_pixmapsdir='${glade_datadir}/pixmaps'
glade_scriptsdir='${glade_datadir}/scripts'
glade_modulesdir='${glade_libdir}/modules'
glade_pluginsdir='${glade_libdir}/plugins'
glade_bindingsdir='${glade_libdir}/bindings'
glade_icondir='${datadir}/pixmaps'
glade_localedir='${prefix}/${DATADIRNAME}/locale'
AC_SUBST(glade_version)
AC_SUBST(glade_datadir)
AC_SUBST(glade_libdir)
AC_SUBST(glade_catalogsdir)
AC_SUBST(glade_modulesdir)
AC_SUBST(glade_pluginsdir)
AC_SUBST(glade_bindingsdir)
AC_SUBST(glade_pixmapsdir)
AC_SUBST(glade_scriptsdir)
AC_SUBST(glade_icondir)
AC_SUBST(glade_localedir)
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS])
AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
Makefile
......@@ -184,7 +164,6 @@ widgets/Makefile
po/Makefile.in
src/Makefile
src/libgladeui-1.0.pc
src/glade-paths.sh
doc/Makefile
doc/version.xml
help/Makefile
......
smalliconsdir = $(glade_pixmapsdir)/16x16
smalliconsdir = $(pkgdatadir)/pixmaps/16x16
smallicons_DATA = \
alignment.png \
......
largeiconsdir = $(glade_pixmapsdir)/22x22
largeiconsdir = $(pkgdatadir)/pixmaps/22x22
largeicons_DATA = \
alignment.png \
......
SUBDIRS = 16x16 22x22
pixmapsdir = $(glade_pixmapsdir)
pixmapsdir = $(pkgdatadir)/pixmaps
pixmaps_DATA = selector.png devhelp.png plus.png
......
## 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
......@@ -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"
......
......@@ -26,7 +26,6 @@
#include "glade.h"
#include "glade-binding.h"
#include "glade-paths.h"
#include <string.h>
/*
......
#!/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
......@@ -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"
......
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
datarootdir=@datarootdir@
datadir=@datadir@
includedir=@includedir@/libgladeui-1.0/libgladeui
catalogdir=@datadir@/@PACKAGE@/catalogs
......
......@@ -2,7 +2,7 @@
CLEANFILES = gtk+.xml
catalogsdir = $(glade_catalogsdir)
catalogsdir = $(pkgdatadir)/catalogs
catalogs_DATA = gtk+.xml gtk+.xml.in
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment