forked from AuroraMiddleware/gtk
Drop gtk-update-icon-cache complications
gtk-update-icon-cache is no longer used at build time, so a lot of the complicated machinery we have around that (conditional build, cross build, etc) are no longer required.
This commit is contained in:
Matthias Clasen
parent
79e916f6af
commit
655c75cab7
46
configure.ac
46
configure.ac
@ -279,13 +279,6 @@ AC_ARG_ENABLE(installed_tests,
|
||||
[enable_installed_tests=no])
|
||||
AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
|
||||
|
||||
AC_ARG_ENABLE(gtk2-dependency,
|
||||
[AS_HELP_STRING([--enable-gtk2-dependency],
|
||||
[Do not build gtk-update-icon-cache and other shared tools])],,
|
||||
[enable_gtk2_dependency=no])
|
||||
|
||||
AM_CONDITIONAL(BUILD_ICON_CACHE, [test "x$enable_gtk2_dependency" = xno])
|
||||
|
||||
AC_ARG_ENABLE(xkb,
|
||||
[AS_HELP_STRING([--enable-xkb],
|
||||
[support XKB extension [default=maybe]])],,
|
||||
@ -965,44 +958,6 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
|
||||
|
||||
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
|
||||
|
||||
AS_IF([test "x$enable_gtk2_dependency" = xyes],
|
||||
[AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
|
||||
if test x$GTK_UPDATE_ICON_CACHE = xno; then
|
||||
AC_MSG_ERROR([
|
||||
*** --enable-gtk2-dependency has been set but no existing
|
||||
*** `gtk-update-icon-cache` has been found in the path.])
|
||||
fi],
|
||||
|
||||
[test "x$cross_compiling" = xyes],
|
||||
[# If no GTK+2 dependency and cross compiling, we need to find a host gdk-pixbuf.
|
||||
# pkg.m4 blocks all variable starting with PKG, so allow this one
|
||||
m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
|
||||
|
||||
AS_IF([test x$PKG_CONFIG_FOR_BUILD = x],
|
||||
[AC_MSG_ERROR([You must define PKG_CONFIG_FOR_BUILD when cross compiling])])
|
||||
|
||||
AC_MSG_CHECKING([for native gdk-pixbuf])
|
||||
AS_IF([AC_RUN_LOG([$PKG_CONFIG_FOR_BUILD --exists --print-errors gdk-pixbuf-2.0])],
|
||||
[AC_MSG_RESULT([yes])],
|
||||
[AC_MSG_ERROR([native gdk-pixbuf not found])])
|
||||
|
||||
NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0`
|
||||
NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0`
|
||||
# This is the native gtk-update-icon-cache which will be used at
|
||||
# build time, NOT the one installed on the target host.
|
||||
GTK_UPDATE_ICON_CACHE="`cd $builddir && pwd`/gtk/native/native-update-icon-cache$BUILD_EXEEXT"
|
||||
AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS)
|
||||
AC_SUBST(NATIVE_GDKPIXBUF_LIBS)
|
||||
AC_SUBST(GTK_UPDATE_ICON_CACHE)],
|
||||
|
||||
[# In native compiling case, the gtk-update-icon-cache installed
|
||||
# is the same as the one used during build.
|
||||
GTK_UPDATE_ICON_CACHE="\$(abs_top_builddir)/gtk/gtk-update-icon-cache$EXEEXT"
|
||||
AC_SUBST(GTK_UPDATE_ICON_CACHE)]
|
||||
)
|
||||
|
||||
AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes])
|
||||
|
||||
########################################
|
||||
# Windowing system checks
|
||||
########################################
|
||||
@ -1943,7 +1898,6 @@ gtk/makefile.msc
|
||||
gtk/gtkversion.h
|
||||
gtk/gtk-win32.rc
|
||||
gtk/libgtk3.manifest
|
||||
gtk/native/Makefile
|
||||
util/Makefile
|
||||
libgail-util/Makefile
|
||||
modules/Makefile
|
||||
|
||||
@ -19,8 +19,6 @@ else
|
||||
GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
|
||||
endif
|
||||
|
||||
SUBDIRS = native .
|
||||
|
||||
if HAVE_CLOUDPRINT
|
||||
if HAVE_PAPI_CUPS
|
||||
GTK_PRINT_BACKENDS=file,papi,cups,cloudprint
|
||||
@ -1435,10 +1433,8 @@ endif
|
||||
bin_PROGRAMS = \
|
||||
gtk-query-immodules-3.0 \
|
||||
gtk-launch \
|
||||
gtk-encode-symbolic-svg
|
||||
|
||||
if BUILD_ICON_CACHE
|
||||
bin_PROGRAMS += gtk-update-icon-cache
|
||||
gtk-encode-symbolic-svg \
|
||||
gtk-update-icon-cache
|
||||
|
||||
if OS_WIN32
|
||||
|
||||
@ -1477,17 +1473,14 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDA
|
||||
$(WINDRES) --input $< --output $@ --output-format=coff
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
|
||||
gtk_query_immodules_3_0_LDADD = $(LDADDS) $(GMODULE_LIBS)
|
||||
gtk_query_immodules_3_0_SOURCES = queryimmodules.c
|
||||
|
||||
if BUILD_ICON_CACHE
|
||||
gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
|
||||
gtk_update_icon_cache_DEPENDENCIES = $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
|
||||
gtk_update_icon_cache_SOURCES = updateiconcache.c
|
||||
endif
|
||||
|
||||
gtk_encode_symbolic_svg_LDADD = $(GDK_PIXBUF_LIBS) $(top_builddir)/gdk/libgdk-3.la $(GTK_DEP_LIBS)
|
||||
gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
CC = @CC_FOR_BUILD@
|
||||
AM_CFLAGS = @CFLAGS_FOR_BUILD@
|
||||
CPP = @CPP_FOR_BUILD@
|
||||
AM_CPPFLAGS = @CPPFLAGS_FOR_BUILD@
|
||||
AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
|
||||
|
||||
native-update-icon-cache$(BUILD_EXEEXT): $(srcdir)/../updateiconcache.c
|
||||
echo '#define GETTEXT_PACKAGE "gtk30"' > $(srcdir)/config.h
|
||||
$(AM_V_CCLD)$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir)/../.. $(NATIVE_GDKPIXBUF_CFLAGS) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(NATIVE_GDKPIXBUF_LIBS) $(LIBS_FOR_BUILD) -o $@
|
||||
rm -f $(srcdir)/config.h
|
||||
|
||||
if CROSS_COMPILING
|
||||
if !USE_EXTERNAL_ICON_CACHE
|
||||
all-local: native-update-icon-cache$(BUILD_EXEEXT)
|
||||
|
||||
native_update_icon_cache_CFLAGS = $(NATIVE_GDKPIXBUF_CFLAGS)
|
||||
native_update_icon_cache_LDADD = $(NATIVE_GDKPIXBUF_LIBS)
|
||||
native_update_icon_cache_SOURCES = $(srcdir)/../updateiconcache.c
|
||||
endif
|
||||
endif
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
Loading…
Reference in New Issue
Block a user