build: Use variables from PKG_CHECK_MODULES instead of -pkg
The -pkg compiler option doesn't follow the PKG_CONFIG_PATH environment variable, causing errors in some build environment, like bockbuild or possibly jhbuild. Use the variables set by the various PKG_CHECK_MODULES calls instead.
This commit is contained in:
Родитель
6b09480d8b
Коммит
270c098e62
|
@ -31,9 +31,9 @@ SRCS = \
|
||||||
$(GDK_SRCS)
|
$(GDK_SRCS)
|
||||||
|
|
||||||
ASSEMBLIES = \
|
ASSEMBLIES = \
|
||||||
-pkg:glib-sharp-2.0 \
|
$(GLIBSHARP_LIBS) \
|
||||||
-pkg:gio-sharp-2.0 \
|
$(GIOSHARP_LIBS) \
|
||||||
-pkg:gtk-sharp-2.0
|
$(GTKSHARP_LIBS)
|
||||||
|
|
||||||
all: gtk-sharp-beans.dll
|
all: gtk-sharp-beans.dll
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,11 @@ AC_SUBST(GACUTIL)
|
||||||
AC_SUBST(GACUTIL_FLAGS)
|
AC_SUBST(GACUTIL_FLAGS)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= 2.12)
|
PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= 2.12)
|
||||||
|
AC_SUBST(GTKSHARP_LIBS)
|
||||||
PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= 2.12)
|
PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= 2.12)
|
||||||
|
AC_SUBST(GLIBSHARP_LIBS)
|
||||||
PKG_CHECK_MODULES(GIOSHARP, gio-sharp-2.0 >= 2.18)
|
PKG_CHECK_MODULES(GIOSHARP, gio-sharp-2.0 >= 2.18)
|
||||||
|
AC_SUBST(GIOSHARP_LIBS)
|
||||||
PKG_CHECK_MODULES(GAPI, gapi-2.0 >= 2.12.0)
|
PKG_CHECK_MODULES(GAPI, gapi-2.0 >= 2.12.0)
|
||||||
|
|
||||||
CSC_DEFINES=""
|
CSC_DEFINES=""
|
||||||
|
|
Загрузка…
Ссылка в новой задаче