Commit 07d49ee5 authored by Matthias Clasen's avatar Matthias Clasen

Merge libgdk and libgtk

This commit does a number of things:
- remove some dead wchar configury from configure.ac and gdkconfig.h
- repurpose gdkconfig.h as header that contains GDK_WINDOWING_foo
  macros for each included backend, include it in gdk.h and install
  it in $includedir instead of below $libdir
- drop the backend from the library names
- build libgdk-3.0.la as a convenience lib and include it in libgtk-3.0.la
It does not yet enable building multiple backends at the same time.
parent ae146a28
......@@ -267,12 +267,6 @@ case $gdktarget in
*) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz or win32.]);;
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
AC_SUBST(gdktargetlib)
AC_SUBST(gtktargetlib)
if test "x$enable_debug" = "xyes"; then
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
......@@ -666,53 +660,6 @@ else
fi
fi
# `widechar' tests for gdki18n.h
AC_MSG_CHECKING(for wchar.h)
AC_TRY_CPP([#include <wchar.h>], gdk_wchar_h=yes, gdk_wchar_h=no)
if test $gdk_wchar_h = yes; then
AC_DEFINE(HAVE_WCHAR_H, 1, [Have wchar.h include file])
fi
AC_MSG_RESULT($gdk_wchar_h)
# Check for wctype.h (for iswalnum)
AC_MSG_CHECKING(for wctype.h)
AC_TRY_CPP([#include <wctype.h>], gdk_wctype_h=yes, gdk_wctype_h=no)
if test $gdk_wctype_h = yes; then
AC_DEFINE(HAVE_WCTYPE_H, 1, [Have wctype.h include file])
fi
AC_MSG_RESULT($gdk_wctype_h)
# in Solaris 2.5, `iswalnum' is in -lw
GDK_WLIBS=
AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
oLIBS="$LIBS"
LIBS="$LIBS $GDK_WLIBS"
# The following is necessary for Linux libc-5.4.38
AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
AC_TRY_LINK([#include <stdlib.h>],[
#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
# ifdef HAVE_WCTYPE_H
# include <wctype.h>
# else
# ifdef HAVE_WCHAR_H
# include <wchar.h>
# endif
# endif
#else
# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
#endif
iswalnum((wchar_t) 0);
], gdk_working_wctype=yes, gdk_working_wctype=no)
LIBS="$oLIBS"
if test $gdk_working_wctype = no; then
AC_DEFINE(HAVE_BROKEN_WCTYPE, 1, [Is the wctype implementation broken])
GDK_WLIBS=
fi
AC_MSG_RESULT($gdk_working_wctype)
AC_SUBST(GDK_WLIBS)
# Check for uxtheme.h (for MS-Windows Engine)
AC_MSG_CHECKING(for uxtheme.h)
AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no)
......@@ -883,7 +830,7 @@ fi
# Windowing system checks
########################################
GDK_EXTRA_LIBS="$GDK_WLIBS"
GDK_EXTRA_LIBS=
GDK_EXTRA_CFLAGS=
# GTK+ uses some X calls, so needs to link against X directly
......@@ -1530,12 +1477,16 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
* This is a generated file. Please modify `configure.ac'
*/
#ifndef GDKCONFIG_H
#define GDKCONFIG_H
#ifndef __GDKCONFIG_H__
#define __GDKCONFIG_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
#include <glib.h>
G_BEGIN_DECLS
#ifndef GSEAL
/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */
......@@ -1550,16 +1501,13 @@ _______EOF
cat >>$outfile <<_______EOF
$gdk_windowing
$gdk_wc
_______EOF
cat >>$outfile <<_______EOF
#ifdef __cplusplus
}
#endif /* __cplusplus */
G_END_DECLS
#endif /* GDKCONFIG_H */
#endif /* __GDKCONFIG_H__ */
_______EOF
......@@ -1570,31 +1518,20 @@ _______EOF
mv $outfile gdk/gdkconfig.h
fi
],[
if test "x$gdktarget" = "xx11" ; then
gdk_windowing='
gdk_windowing=''
if expr "$gdktarget" : ".*x11.*" > /dev/null ; then
gdk_windowing+='
#define GDK_WINDOWING_X11'
elif test "x$gdktarget" = "xwin32" ; then
gdk_windowing='
fi
if expr "$gdktarget" : ".*win32.*" > /dev/null ; then
gdk_windowing+='
#define GDK_NATIVE_WINDOW_POINTER
#define GDK_WINDOWING_WIN32'
elif test "x$gdktarget" = "xquartz" ; then
fi
if expr "$gdktarget" : ".*quartz.*" > /dev/null ; then
gdk_windowing='
#define GDK_WINDOWING_QUARTZ'
fi
if test x$gdk_wchar_h = xyes; then
gdk_wc='
#define GDK_HAVE_WCHAR_H 1'
fi
if test x$gdk_wctype_h = xyes; then
gdk_wc="\$gdk_wc
#define GDK_HAVE_WCTYPE_H 1"
fi
if test x$gdk_working_wctype = xno; then
gdk_wc="\$gdk_wc
#define GDK_HAVE_BROKEN_WCTYPE 1"
fi
])
dnl
......
......@@ -11,14 +11,12 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS) \
DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la
LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS) \
$(MATH_LIB)
noinst_PROGRAMS = \
......
......@@ -55,13 +55,11 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
$(top_builddir)/gtk/libgtk-3.0.la
LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS) \
-lm
bin_PROGRAMS = gtk3-demo
......
......@@ -45,7 +45,7 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib) $(GDK_DEP_LIBS)
GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.0.la $(GDK_DEP_LIBS)
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
......
......@@ -107,8 +107,7 @@ CPPFLAGS += \
-UGTK_DISABLE_SINGLE_INCLUDES
GTKDOC_LIBS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk/x11 \
$(GTK_DEBUG_FLAGS) \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk/x11 \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la
LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS) \
$(GDK_DEP_LIBS) \
LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS) \
-lm
if USE_X11
......
......@@ -45,8 +45,7 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
LDADD = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
noinst_PROGRAMS = hello-world window-default
......@@ -92,6 +92,7 @@ gdk_public_h_sources = \
gdkwindow.h
gdk_built_public_sources = \
gdkconfig.h \
gdkenumtypes.h
gdk_private_headers = \
......@@ -145,6 +146,10 @@ common_sources = \
gdkmarshalers.c \
gdkmarshalers.h
libgdk_3_0_la_SOURCES = $(common_sources)
libgdk_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS)
libgdk_3_0_la_LDFLAGS = $(LDADD)
libgdk_x11_3_0_la_SOURCES = $(common_sources)
libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS)
libgdk_x11_3_0_la_LDFLAGS = $(LDADD)
......@@ -166,10 +171,10 @@ introspection_files = \
gdkenumtypes.c \
gdkenumtypes.h
Gdk-3.0.gir: $(gdktargetlib) Makefile
Gdk-3.0.gir: libgdk-3.0.la Makefile
Gdk_3_0_gir_SCANNERFLAGS = --warn-all
Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
Gdk_3_0_gir_LIBS = $(gdktargetlib)
Gdk_3_0_gir_LIBS = libgdk-3.0.la
Gdk_3_0_gir_FILES = $(introspection_files)
Gdk_3_0_gir_CFLAGS = $(INCLUDES)
INTROSPECTION_GIRS += Gdk-3.0.gir
......@@ -210,10 +215,10 @@ x11_introspection_files = \
x11/xsettings-common.c \
x11/gdkx.h
GdkX11-3.0.gir: $(gdktargetlib) Gdk-3.0.gir Makefile
GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile
GdkX11_3_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
GdkX11_3_0_gir_LIBS = $(gdktargetlib)
GdkX11_3_0_gir_LIBS = libgdk-3.0.la
GdkX11_3_0_gir_FILES = $(x11_introspection_files)
GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
INTROSPECTION_GIRS += GdkX11-3.0.gir
......@@ -271,29 +276,15 @@ TESTS = abicheck.sh
endif
lib_LTLIBRARIES = $(gdktargetlib)
EXTRA_LTLIBRARIES = libgdk-x11-3.0.la libgdk-win32-3.0.la libgdk-quartz-3.0.la
noinst_LTLIBRARIES = libgdk-3.0.la
MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
EXTRA_DIST += $(gdk_built_sources)
EXTRA_HEADERS =
#
# Rule to install gdkconfig.h header file
#
configexecincludedir = $(libdir)/gtk-3.0/include
#configexecinclude_DATA = gdkconfig.h
install-exec-local: gdkconfig.h
$(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
file=$(DESTDIR)$(configexecincludedir)/gdkconfig.h; \
if test -r $$file && cmp -s gdkconfig.h $$file; then :; \
else $(INSTALL_DATA) gdkconfig.h $$file; fi
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gdktargetlib)
$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.0.la
endif
#note: not gdkconfig.h
......
......@@ -29,6 +29,7 @@
#define __GDK_H_INSIDE__
#include <gdk/gdkconfig.h>
#include <gdk/gdkapplaunchcontext.h>
#include <gdk/gdkcairo.h>
#include <gdk/gdkcolor.h>
......
......@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
progs_ldadd = \
$(GDK_DEP_LIBS) \
$(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/libgdk-$(GTK_API_VERSION).la \
$(NULL)
#TEST_PROGS += check-gdk-cairo
......
......@@ -109,8 +109,8 @@ TESTS = abicheck.sh
endif
libgtkincludedir = $(includedir)/gtk-3.0/gtk
libadd = \
$(top_builddir)/gdk/$(gdktargetlib) \
libadd = \
$(top_builddir)/gdk/libgdk-3.0.la \
$(GTK_DEP_LIBS)
deps =
......@@ -866,7 +866,7 @@ gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
gtktestutils.c: gtktypefuncs.c
# target platform:
lib_LTLIBRARIES = $(gtktargetlib)
lib_LTLIBRARIES = libgtk-3.0.la
gtkincludedir = $(includedir)/gtk-3.0/gtk
gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
......@@ -874,30 +874,22 @@ gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk
gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
libgtk_x11_3_0_la_SOURCES = $(gtk_c_sources)
libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources)
libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources)
libgtk_3_0_la_SOURCES = $(gtk_c_sources)
libgtk_3_0_la_LDFLAGS = $(libtool_opts)
libgtk_3_0_la_LIBADD = $(libadd)
libgtk_3_0_la_DEPENDENCIES = $(deps)
libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
libgtk_x11_3_0_la_LIBADD = $(libadd)
libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
libgtk_quartz_3_0_la_LIBADD = $(libadd)
libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
#libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
#libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
#libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
if USE_WIN32
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
endif
EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib)
$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.0.la
endif
if USE_QUARTZ
......@@ -944,13 +936,13 @@ distclean-local:
rm -f $(MAINTAINERCLEANFILES); \
fi
DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
DEPS = libgtk-3.0.la $(top_builddir)/gdk/libgdk-3.0.la
TEST_DEPS = $(DEPS) immodules.cache
LDADDS = \
$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
libgtk-3.0.la \
$(top_builddir)/gdk/libgdk-3.0.la \
$(GTK_DEP_LIBS)
if HAVE_INTROSPECTION
......@@ -960,7 +952,7 @@ introspection_files = \
gtktypebuiltins.h \
gtktypebuiltins.c
Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.0.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
Gtk_3_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
if USE_X11
Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
......@@ -971,10 +963,7 @@ Gtk_3_0_gir_CFLAGS = \
-UGDK_DISABLE_DEPRECATED \
-UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
Gtk_3_0_gir_LIBS = $(gtktargetlib)
if USE_X11
Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/libgdk-x11-3.0.la
endif
Gtk_3_0_gir_LIBS = libgtk-3.0.la
Gtk_3_0_gir_FILES = $(introspection_files)
INTROSPECTION_GIRS += Gtk-3.0.gir
......
......@@ -25,7 +25,6 @@
#ifndef __GTK_BUILDER_H__
#define __GTK_BUILDER_H__
#include <gdkconfig.h>
#include <glib-object.h>
G_BEGIN_DECLS
......
......@@ -32,8 +32,7 @@
#include <math.h>
#include <string.h>
#include "gdkconfig.h"
#include "gdk/gdkkeysyms.h"
#include "gdk/gdk.h"
#include "gtkhsv.h"
#include "gtkwindow.h"
#include "gtkselection.h"
......
......@@ -29,9 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include "gdkconfig.h"
#include "gdk/gdkkeysyms.h"
#include "gdk/gdk.h"
#include "gtkdnd.h"
#include "gtkiconfactory.h"
......
......@@ -30,9 +30,7 @@
#include <stdlib.h>
#include <string.h>
#include "gdkconfig.h"
#include "gdk/gdkkeysyms.h"
#include "gdk/gdk.h"
#ifdef GDK_WINDOWING_X11
#include <X11/Xlib.h>
......
......@@ -32,7 +32,7 @@
#include "gtklayout.h"
#include "gdkconfig.h"
#include "gdk/gdk.h"
#include "gtkprivate.h"
#include "gtkintl.h"
......
......@@ -24,7 +24,6 @@
#ifndef __GTK_LIST_STORE_H__
#define __GTK_LIST_STORE_H__
#include <gdkconfig.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
......
......@@ -29,7 +29,7 @@
#include "gtkmain.h"
#include <glib.h>
#include "gdkconfig.h"
#include "gdk/gdk.h"
#include <locale.h>
......@@ -64,7 +64,6 @@
#include "gtktooltip.h"
#include "gtkdebug.h"
#include "gtkmenu.h"
#include "gdk/gdkkeysyms.h"
#ifdef G_OS_WIN32
......
......@@ -42,7 +42,7 @@
#include <glib.h>
#include <glib/gstdio.h>
#include "gdkconfig.h"
#include "gdk/gdk.h"
#include "gtkversion.h"
#include "gtkrc.h"
......
......@@ -27,13 +27,13 @@
#include "gtksearchenginetracker.h"
#include "gtksearchenginequartz.h"
#include <gdk/gdkconfig.h> /* for GDK_WINDOWING_QUARTZ */
#include <gdk/gdk.h> /* for GDK_WINDOWING_QUARTZ */
#ifndef G_OS_WIN32 /* Beagle and tracker are not ported
* to Windows, as far as I know.
*/
#define HAVE_BEAGLE 1
#define HAVE_BEAGLE 1
#define HAVE_TRACKER 1
#endif
......
......@@ -31,7 +31,7 @@
#ifndef __GTK_TEXT_CHILD_H__
#define __GTK_TEXT_CHILD_H__
#include <gdkconfig.h>
#include <gdk/gdk.h>
#include <glib-object.h>
G_BEGIN_DECLS
......
......@@ -25,7 +25,6 @@
#ifndef __GTK_TREE_MODEL_FILTER_H__
#define __GTK_TREE_MODEL_FILTER_H__
#include <gdkconfig.h>
#include <gtk/gtktreemodel.h>
G_BEGIN_DECLS
......
......@@ -24,7 +24,7 @@
#ifndef __GTK_TREE_MODEL_SORT_H__
#define __GTK_TREE_MODEL_SORT_H__
#include <gdkconfig.h>
#include <gdk/gdk.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
......
......@@ -24,7 +24,7 @@
#ifndef __GTK_TREE_STORE_H__
#define __GTK_TREE_STORE_H__
#include <gdkconfig.h>
#include <gdk/gdk.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
#include <stdarg.h>
......
......@@ -11,12 +11,10 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
$(top_builddir)/gtk/libgtk-3.0.la
progs_ldadd = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
......
......@@ -17,12 +17,10 @@ INCLUDES = \
$(INCLUDED_IMMODULE_DEFINE)
DEPS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
$(top_builddir)/gtk/libgtk-3.0.la
LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
......
......@@ -141,8 +141,7 @@ libgail_la_CFLAGS = \
$(AM_CFLAGS)
libgail_la_LIBADD = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(top_builddir)/modules/other/gail/libgail-util/libgailutil-3.0.la \
$(GTK_DEP_LIBS) \
$(INTLLIBS)
......
......@@ -16,8 +16,7 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
......
......@@ -28,8 +28,7 @@ libprintbackend_file_la_LDFLAGS = \
-avoid-version -module $(no_undefined)
libprintbackend_file_la_LIBADD = \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
noinst_HEADERS = \
......
......@@ -15,8 +15,8 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
$(GTK_DEP_LIBS) \
$(top_builddir)/gtk/$(gtktargetlib)
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
......
......@@ -13,8 +13,8 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS)
LDADDS = \
$(GTK_DEP_LIBS) \
$(top_builddir)/gtk/$(gtktargetlib)
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
......
......@@ -28,7 +28,7 @@ libprintbackend_test_la_LDFLAGS = \
-avoid-version -module $(no_undefined)
libprintbackend_test_la_LIBADD = \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
noinst_HEADERS = \
......
......@@ -10,13 +10,11 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la
LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS)
noinst_PROGRAMS = \
......
......@@ -11,14 +11,12 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) \
$(GDK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS) \
DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la
LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \
$(GTK_DEP_LIBS) \
-lm
if USE_X11
......
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