diff options
| author | Johannes Schmid <jhs@gnome.org> | 2010-11-18 16:24:58 +0100 |
|---|---|---|
| committer | Johannes Schmid <jhs@gnome.org> | 2010-11-18 16:24:58 +0100 |
| commit | a05805d16445ee710f3a480f3cd238b015b8b2e6 (patch) | |
| tree | bd3bf91a39a854aa62c9a7cdeb05eecb8f9332d6 /gladeui/Makefile.am | |
| parent | 38f0171103862b1f300317efbe41bdba383af5a4 (diff) | |
| download | glade-a05805d16445ee710f3a480f3cd238b015b8b2e6.tar.gz | |
Use libgladeui-3 as library name, remove --with-gtk option and adapt
Makefiles and configure.in
As we can only build against gtk+-3.0 anyway, we should use a suitable
library name.
Diffstat (limited to 'gladeui/Makefile.am')
| -rw-r--r-- | gladeui/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am index 6ce8dd85..3a5a8612 100644 --- a/gladeui/Makefile.am +++ b/gladeui/Makefile.am @@ -8,14 +8,14 @@ common_defines = \ -DGLADE_LOCALEDIR="\"$(datadir)/locale\""\ -DGLADE_BINDIR="\"$(bindir)\"" -lib_LTLIBRARIES = libgladeui-2.la +lib_LTLIBRARIES = libgladeui-3.la BUILT_SOURCES = glade-marshallers.c glade-marshallers.h EXTRA_DIST = glade-marshallers.list gladeui.rc.in icon-naming-spec.c glade-previewer.rc.in # The glade-3 core library -libgladeui_2_la_SOURCES = \ +libgladeui_3_la_SOURCES = \ glade-widget-adaptor.c \ glade-debug.c \ glade-project.c \ @@ -60,24 +60,24 @@ libgladeui_2_la_SOURCES = \ glade-editor-table.c \ glade-cell-renderer-icon.c -libgladeui_2_la_CPPFLAGS = \ +libgladeui_3_la_CPPFLAGS = \ $(common_defines) \ -I$(top_srcdir) \ -I$(top_builddir) \ $(AM_CPPFLAGS) -libgladeui_2_la_CFLAGS = \ +libgladeui_3_la_CFLAGS = \ $(GTK_CFLAGS) \ $(IGE_MAC_BUNDLE_FLAG) \ $(IGE_MAC_CFLAGS) \ $(WARN_CFLAGS) \ $(AM_CFLAGS) -libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) -libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS) +libgladeui_3_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) +libgladeui_3_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS) -libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui +libgladeuiincludedir=$(includedir)/libgladeui-3.0/gladeui libgladeuiinclude_HEADERS = \ glade.h \ glade-debug.h \ @@ -117,12 +117,12 @@ libgladeuiinclude_HEADERS = \ if PLATFORM_WIN32 -libgladeui_2_la_LDFLAGS += -no-undefined +libgladeui_3_la_LDFLAGS += -no-undefined endif if NATIVE_WIN32 -libgladeui_2_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def -libgladeui_2_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def +libgladeui_3_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def +libgladeui_3_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def endif gladeui-win32-res.o: gladeui.rc |