]> Pileus Git - ~andy/gtk/blobdiff - gdk/Makefile.am
Merge libgdk and libgtk
[~andy/gtk] / gdk / Makefile.am
index 4b40bc3cbc9f45fa8e8d0307dd1b7f6d730d5283..801719d9ac4d12b12c89edf90f58929b146b2b20 100644 (file)
@@ -9,7 +9,7 @@ INTROSPECTION_COMPILER_ARGS = \
    --includedir=.
 
 SUBDIRS = $(gdktarget) . tests
-DIST_SUBDIRS = win32 x11 quartz directfb tests
+DIST_SUBDIRS = win32 x11 quartz tests
 
 CLEANFILES =
 
@@ -21,7 +21,6 @@ EXTRA_DIST +=                 \
        gdkkeysyms-update.pl    \
        gdk.def                 \
        gdkmarshalers.list      \
-       gdkmedialib.h           \
        gdkwindowimpl.h         \
        makeenums.pl            \
        makefile.msc            \
@@ -55,13 +54,6 @@ LDADD = \
        $(no_undefined)                                                 \
        $(LIBTOOL_EXPORT_OPTIONS)
 
-if USE_MEDIALIB
-medialib_sources =  \
-    gdkmedialib.c
-else
-medialib_sources =
-endif
-
 #
 # setup source file variables
 #
@@ -79,38 +71,36 @@ gdk_public_h_sources =                              \
        gdkdisplay.h                            \
        gdkdisplaymanager.h                     \
        gdkdnd.h                                \
-       gdkdrawable.h                           \
        gdkevents.h                             \
-       gdkgc.h                                 \
-       gdkimage.h                              \
-       gdkinput.h                              \
        gdkkeys.h                               \
        gdkkeysyms.h                            \
+       gdkkeysyms-compat.h                     \
+       gdkmain.h                               \
        gdkpango.h                              \
        gdkpixbuf.h                             \
-       gdkpixmap.h                             \
        gdkprivate.h                            \
        gdkproperty.h                           \
-       gdkrgb.h                                \
+       gdkrectangle.h                          \
+       gdkrgba.h                               \
        gdkscreen.h                             \
        gdkselection.h                          \
        gdkspawn.h                              \
        gdktestutils.h                          \
+       gdkthreads.h                            \
        gdktypes.h                              \
        gdkvisual.h                             \
        gdkwindow.h
 
 gdk_built_public_sources =                     \
+       gdkconfig.h                             \
        gdkenumtypes.h
 
 gdk_private_headers =                          \
        gdkinternals.h                          \
        gdkdeviceprivate.h                      \
-       gdkintl.h                               \
-       gdkpoly-generic.h
+       gdkintl.h
 
 gdk_c_sources =                 \
-       $(medialib_sources)     \
        gdk.c                   \
        gdkapplaunchcontext.c   \
        gdkcairo.c              \
@@ -121,20 +111,15 @@ gdk_c_sources =                 \
        gdkdisplay.c            \
        gdkdisplaymanager.c     \
        gdkdnd.c                \
-       gdkdraw.c               \
        gdkevents.c             \
-       gdkgc.c                 \
        gdkglobals.c            \
-       gdkimage.c              \
        gdkkeys.c               \
        gdkkeyuni.c             \
        gdkoffscreenwindow.c    \
        gdkpango.c              \
        gdkpixbuf-drawable.c    \
-       gdkpixbuf-render.c      \
-       gdkpixmap.c             \
        gdkrectangle.c          \
-       gdkrgb.c                \
+       gdkrgba.c               \
        gdkscreen.c             \
        gdkselection.c          \
        gdkvisual.c             \
@@ -161,9 +146,9 @@ common_sources =            \
        gdkmarshalers.c         \
        gdkmarshalers.h
 
-libgdk_directfb_3_0_la_SOURCES = $(common_sources)
-libgdk_directfb_3_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS)
-libgdk_directfb_3_0_la_LDFLAGS = $(LDADD)
+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)
@@ -181,15 +166,15 @@ libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(src
 if HAVE_INTROSPECTION
 
 introspection_files =          \
-       $(gdk_public_h_sources) \
+       $(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))      \
        $(gdk_c_sources)        \
         gdkenumtypes.c         \
         gdkenumtypes.h
 
-Gdk-3.0.gir: $(gdktargetlib) Makefile
-Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
+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
@@ -199,7 +184,6 @@ x11_introspection_files =           \
        x11/checksettings.c             \
        x11/gdkapplaunchcontext-x11.c   \
        x11/gdkasync.c                  \
-       x11/gdkcolor-x11.c              \
        x11/gdkcursor-x11.c             \
        x11/gdkdevice-core.c            \
        x11/gdkdevicemanager-core.c     \
@@ -210,18 +194,13 @@ x11_introspection_files =                 \
        x11/gdkdevice-xi.c              \
        x11/gdkdisplay-x11.c            \
        x11/gdkdnd-x11.c                \
-       x11/gdkdrawable-x11.c           \
        x11/gdkeventsource.c            \
        x11/gdkeventtranslator.c        \
-       x11/gdkgc-x11.c                 \
        x11/gdkgeometry-x11.c           \
        x11/gdkglobals-x11.c            \
-       x11/gdkimage-x11.c              \
        x11/gdkim-x11.c                 \
-       x11/gdkinput.c                  \
        x11/gdkkeys-x11.c               \
        x11/gdkmain-x11.c               \
-       x11/gdkpixmap-x11.c             \
        x11/gdkproperty-x11.c           \
        x11/gdkscreen-x11.c             \
        x11/gdkselection-x11.c          \
@@ -236,13 +215,16 @@ x11_introspection_files =                 \
        x11/xsettings-common.c          \
         x11/gdkx.h
 
-GdkX11-3.0.gir: $(gdktargetlib) Gdk-3.0.gir Makefile
-GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11
+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
+
+introspection_files += $(filter-out x11/gdkx.h, $(x11_introspection_files))
+
 endif # USE_X11
 
 girdir = $(datadir)/gir-1.0
@@ -257,6 +239,7 @@ endif # HAVE_INTROSPECTION
 
 if OS_WIN32
 install-def-file: gdk.def
+       mkdir -p $(DESTDIR)$(libdir)
        $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
@@ -272,6 +255,7 @@ gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
 
 install-ms-lib:
+       mkdir -p $(DESTDIR)$(libdir)
        $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
 
 uninstall-ms-lib:
@@ -284,7 +268,7 @@ endif
 # This places the generated .def file in srcdir, since it is expected to be there.
 # (The one from a tarball is)
 gdk.def: gdk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/   /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
+       (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/   /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)"
 if OS_LINUX
@@ -292,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 libgdk-directfb-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