Commit 88360eb4 authored by Tristan Van Berkom's avatar Tristan Van Berkom

* src/Makefile.am, gladeui/Makefile.am, plugins/gtk+/Makefile.am, plugins/gnome/Makefile.am:

	  Fixed makefiles as per bug 521713 (patch initially by Daniel Macks).

Conflicts:

	gladeui/Makefile.am
	plugins/gnome/Makefile.am
	src/Makefile.am
parent 22e76262
2010-12-18 Tristan Van Berkom <tristanvb@openismus.com>
* src/Makefile.am, gladeui/Makefile.am, plugins/gtk+/Makefile.am, plugins/gnome/Makefile.am:
Fixed makefiles as per bug 521713 (patch initially by Daniel Macks).
2010-12-17 Tristan Van Berkom <tristanvb@openismus.com>
* gladeui/glade-project.c: Restore proper sorting of objects at save time.
......
......@@ -6,13 +6,13 @@ lib_LTLIBRARIES = libgladeui-2.la
glade_previewer_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
$(AM_CPPFLAGS)
glade_previewer_CFLAGS = \
-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
$(GTK_CFLAGS) \
$(IGE_MAC_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CPPFLAGS)
glade_previewer_CFLAGS = \
$(AM_CFLAGS)
glade_previewer_LDFLAGS = $(AM_LDFLAGS)
......@@ -96,13 +96,13 @@ libgladeui_2_la_CPPFLAGS = \
$(common_defines) \
-I$(top_srcdir) \
-I$(top_builddir) \
$(AM_CPPFLAGS)
libgladeui_2_la_CFLAGS = \
$(GTK_CFLAGS) \
$(IGE_MAC_BUNDLE_FLAG) \
$(IGE_MAC_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CPPFLAGS)
libgladeui_1_la_CFLAGS = \
$(AM_CFLAGS)
libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
......
......@@ -10,18 +10,15 @@ libgladeui = $(top_builddir)/gladeui/libgladeui-2.la
gladegtk_LTLIBRARIES = libgladegtk.la
gladegtkdir = $(pkglibdir)/modules
libgladegtk_la_CPPLAGS = \
libgladegtk_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(AM_CPPFLAGS)
libgladegtk_la_CFLAGS = \
-DG_LOG_DOMAIN=\"GladeUI-GTK\" \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GTK_CFLAGS) \
$(PLUGINS_WARN_CFLAGS) \
$(AM_CFLAGS)
$(AM_CPPFLAGS)
libgladegtk_la_CFLAGS = $(AM_CFLAGS)
libgladegtk_la_SOURCES = glade-gtk.c glade-accels.c glade-attributes.c glade-convert.c fixed-bg.xpm \
glade-column-types.c glade-model-data.c glade-text-button.c \
......
......@@ -5,13 +5,13 @@ bin_PROGRAMS = glade
glade_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\""
$(AM_CPPFLAGS)
glade_CFLAGS = \
-DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
$(GTK_CFLAGS) \
$(IGE_MAC_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CPPFLAGS)
glade_CFLAGS = \
$(AM_CFLAGS)
glade_LDFLAGS = $(AM_LDFLAGS)
......
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