callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make gail parallel-installable too

Browse Source 
Move libgail-util to libgail-util-3.0, and gail.pc to gail-3.0.pc
This commit is contained in:
Matthias Clasen
2010-05-10 17:02:48 -04:00
parent 37b62be296
commit 7f1f1c09ce
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/other/gail/Makefile.am
View File

@ -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)

18
modules/other/gail/libgail-util/Makefile.am
View File

@ -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