Commit 7f1f1c09 authored by Matthias Clasen's avatar Matthias Clasen

Make gail parallel-installable too

Move libgail-util to libgail-util-3.0, and gail.pc to gail-3.0.pc
parent 37b62be2
......@@ -2112,11 +2112,11 @@ gdk-pixbuf-3.0.pc
gdk-3.0.pc
gtk+-3.0.pc
gtk+-unix-print-3.0.pc
gail.pc
gail-3.0.pc
gdk-pixbuf-3.0-uninstalled.pc
gdk-3.0-uninstalled.pc
gtk+-3.0-uninstalled.pc
gail-uninstalled.pc
gail-3.0-uninstalled.pc
m4macros/Makefile
po/Makefile.in
po-properties/Makefile.in
......
......@@ -6,6 +6,6 @@ includedir=@includedir@
Name: Gail
Description: GNOME Accessibility Implementation Library
Version: @VERSION@
Requires: atk gtk+-2.0
Requires: atk gtk+-3.
Libs: ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail.la ${pc_top_builddir}/${pcfiledir}/modules/other/gail/libgail-util/libgailutil.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/modules/other/gail
......@@ -6,6 +6,6 @@ includedir=@includedir@
Name: Gail
Description: GNOME Accessibility Implementation Library
Version: @VERSION@
Requires: atk gtk+-2.0
Libs: -L${libdir} -lgailutil
Cflags: -I${includedir}/gail-1.0
Requires: atk gtk+-3.0
Libs: -L${libdir} -lgailutil-3.0
Cflags: -I${includedir}/gail-3.0
......@@ -62,7 +62,7 @@ gail_c_sources = \
gailwidget.c \
gailwindow.c
libgailincludedir=$(includedir)/gail-1.0/gail
libgailincludedir=$(includedir)/gail-3.0/gail
gail_private_h_sources = \
gail.h \
......@@ -148,7 +148,7 @@ libgail_la_LIBADD = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/modules/other/gail/libgail-util/libgailutil.la \
$(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.0.la \
$(GTK_DEP_LIBS) \
$(INTLLIBS)
......
......@@ -29,26 +29,26 @@ uninstall-ms-lib:
endif
lib_LTLIBRARIES = libgailutil.la
lib_LTLIBRARIES = libgailutil-3.0.la
util_c_sources = \
gailmisc.c \
gailtextutil.c
libgailutilincludedir=$(includedir)/gail-1.0/libgail-util
libgailutilincludedir=$(includedir)/gail-3.0/libgail-util
util_public_h_sources = \
gailmisc.h \
gailtextutil.h \
gail-util.h
libgailutil_la_SOURCES = \
libgailutil_3_0_la_SOURCES = \
$(util_c_sources)
libgailutilinclude_HEADERS = \
$(util_public_h_sources)
libgailutil_la_CPPFLAGS = \
libgailutil_3_0_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
......@@ -58,24 +58,24 @@ libgailutil_la_CPPFLAGS = \
-DGDK_DISABLE_DEPRECATED\
-DGTK_DISABLE_DEPRECATED
libgailutil_la_CFLAGS = \
libgailutil_3_0_la_CFLAGS = \
$(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS) \
$(AM_CFLAGS)
libgailutil_la_LIBADD = \
libgailutil_3_0_la_LIBADD = \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS)
libgailutil_la_LDFLAGS = \
libgailutil_3_0_la_LDFLAGS = \
-version-info $(GAIL_LT_VERSION_INFO) \
$(no_undefined) \
$(export_symbols) \
$(LDFLAGS)
gailutil.lib: libgailutil.la gailutil.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
gailutil.lib: libgailutil-3.0.la gailutil.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
install-data-local: install-ms-lib install-def-file
......
......@@ -154,7 +154,7 @@ testsocket_DEPENDENCIES = $(DEPS)
testsocket_child_DEPENDENCIES = $(DEPS)
testspinbutton_DEPENDENCIES = $(TEST_DEPS)
teststatusicon_DEPENDENCIES = $(TEST_DEPS)
testtext_DEPENDENCIES = $(TEST_DEPS)
#testtext_DEPENDENCIES = $(TEST_DEPS)
testtreeedit_DEPENDENCIES = $(DEPS)
testtreemodel_DEPENDENCIES = $(DEPS)
testtreeview_DEPENDENCIES = $(DEPS)
......@@ -228,7 +228,7 @@ testtreeflow_LDADD = $(LDADDS)
testtreecolumns_LDADD = $(LDADDS)
testtreecolumnsizing_LDADD = $(LDADDS)
testtreesort_LDADD = $(LDADDS)
testtext_LDADD = $(LDADDS)
#testtext_LDADD = $(LDADDS)
treestoretest_LDADD = $(LDADDS)
testxinerama_LDADD = $(LDADDS)
pixbuf_read_LDADD = $(LDADDS)
......@@ -274,9 +274,9 @@ testtreeview_SOURCES = \
prop-editor.c \
testtreeview.c
testtext_SOURCES = \
prop-editor.c \
testtext.c
#testtext_SOURCES = \
# prop-editor.c \
# testtext.c
testtoolbar_SOURCES = \
testtoolbar.c \
......
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