diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-06-15 16:43:51 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-06-15 16:43:51 -0400 |
| commit | 9240c83dddcedaa3dd482418020622b288c6915f (patch) | |
| tree | 66e314cf52aedbe5911f48d851566e2885fc53a4 /gladeui/Makefile.am | |
| parent | 0da5ff316c1cd3c866463f21063af0b5e59d8fd1 (diff) | |
| download | glade-9240c83dddcedaa3dd482418020622b288c6915f.tar.gz | |
* configure.ac: Require GTK+ 3.0 and change package domain from glade3 -> glade
* src/Makefile.am, gladeui/Makefile.am: application 'glade-3' -> 'glade',
library libgladeui-1 -> libgladeui-2
* plugins/Makefile.am, plugins/gnome/*: Removed libgnomeui support.
* plugins/gtk/gtk+.xml.in, plugins/gtk/glade-gtk.c: Removed all reference to
deprecated GTK+ widgets (anything removed in 3.0).
Diffstat (limited to 'gladeui/Makefile.am')
| -rw-r--r-- | gladeui/Makefile.am | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am index 490d835d..b390f495 100644 --- a/gladeui/Makefile.am +++ b/gladeui/Makefile.am @@ -1,22 +1,19 @@ common_defines = \ -DG_LOG_DOMAIN=\"GladeUI\" \ - -DGLADE_DATADIR="\"$(pkgdatadir)\"" \ - -DGLADE_LIBDIR="\"$(pkglibdir)\"" \ -DGLADE_CATALOGSDIR="\"$(pkgdatadir)/catalogs\""\ -DGLADE_MODULESDIR="\"$(pkglibdir)/modules\"" \ - -DGLADE_PLUGINSDIR="\"$(pkglibdir)/plugins\"" \ -DGLADE_PIXMAPSDIR="\"$(pkgdatadir)/pixmaps\"" \ -DGLADE_LOCALEDIR="\"$(datadir)/locale\"" -lib_LTLIBRARIES = libgladeui-1.la +lib_LTLIBRARIES = libgladeui-2.la BUILT_SOURCES = glade-marshallers.c glade-marshallers.h EXTRA_DIST = glade-marshallers.list gladeui.rc.in icon-naming-spec.c # The glade-3 core library -libgladeui_1_la_SOURCES = \ +libgladeui_2_la_SOURCES = \ glade-widget-adaptor.c \ glade-debug.c \ glade-project.c \ @@ -62,24 +59,24 @@ libgladeui_1_la_SOURCES = \ glade-editor-table.c \ glade-cell-renderer-icon.c -libgladeui_1_la_CPPFLAGS = \ +libgladeui_2_la_CPPFLAGS = \ $(common_defines) \ -I$(top_srcdir) \ -I$(top_builddir) \ $(AM_CPPFLAGS) -libgladeui_1_la_CFLAGS = \ +libgladeui_2_la_CFLAGS = \ $(GTK_CFLAGS) \ $(IGE_MAC_BUNDLE_FLAG) \ $(IGE_MAC_CFLAGS) \ $(WARN_CFLAGS) \ $(AM_CFLAGS) -libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) -libgladeui_1_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS) +libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) +libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS) -libgladeuiincludedir=$(includedir)/libgladeui-1.0/gladeui +libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui libgladeuiinclude_HEADERS = \ glade.h \ glade-debug.h \ @@ -120,12 +117,12 @@ libgladeuiinclude_HEADERS = \ if PLATFORM_WIN32 -libgladeui_1_la_LDFLAGS += -no-undefined +libgladeui_2_la_LDFLAGS += -no-undefined endif if NATIVE_WIN32 -libgladeui_1_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def -libgladeui_1_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def +libgladeui_2_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def +libgladeui_2_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def endif gladeui-win32-res.o: gladeui.rc |