Merge libgdk and libgtk

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 62be9e1bfe26eae4f95ae8db83afa983cd63848a..32b377b4f6667b7a599db068e898ecc1077c5df2 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -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