]> Pileus Git - ~andy/gtk/blobdiff - gdk/Makefile.am
Use correct DLL and import library names, with GTK_API_VERSION in name,
[~andy/gtk] / gdk / Makefile.am
index 404954bd2d9a3f2ef32bf2f157245a43cac49ca6..f33a518c54c98ffcf7beb0b26c3876b7a37a7461 100644 (file)
@@ -1,44 +1,83 @@
 ## Makefile.am for gtk+/gdk
 
 SUBDIRS=$(gdktarget)
-DIST_SUBDIRS=linux-fb nanox win32 x11
+DIST_SUBDIRS=linux-fb win32 x11
 
 EXTRA_DIST =                   \
        gdkconfig.h.win32       \
        gdk.def                 \
-       makefile.mingw          \
-       makefile.mingw.in       \
+       gdkmarshalers.list      \
+       makeenums.pl            \
        makefile.msc
 
 common_includes = @STRIP_BEGIN@        \
        -DG_LOG_DOMAIN=\"Gdk\"          \
+       -DGDK_COMPILATION               \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk-pixbuf      \
+       -DG_DISABLE_DEPRECATED          \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
+       -DGDK_DISABLE_DEPRECATED        \
        @GTK_DEBUG_FLAGS@               \
-       @GTK_XIM_FLAGS@                 \
-       @GTK_LOCALE_FLAGS@              \
-       @PANGO_CFLAGS@                  \
-       @GLIB_CFLAGS@                   \
-       @more_cflags@                   \
+       @GDK_DEP_CFLAGS@                \
 @STRIP_END@
 
 INCLUDES = $(common_includes)
 gtarget=@gdktarget@
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+
+if HAVE_WINTAB
+wintab_lib = -Lwin32 -lwntab32x
+endif
+
+if HAVE_IE55
+ie55uuid_lib = -Lwin32 -lie55uuid
+endif
+endif
+
+if OS_WIN32
+gdk_win32_symbols = -export-symbols gdk.def
+
+install-libtool-import-lib:
+       $(INSTALL) .libs/libgdk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
+uninstall-libtool-import-lib:
+       -rm $(DESTDIR)$(libdir)/libgdk-win32-$(GTK_API_VERSION).dll.a
+else
+install-libtool-import-lib:
+uninstall-libtool-import-lib:
+endif
+
+if MS_LIB_AVAILABLE
+noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
+
+gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
+       lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
+
+install-ms-lib:
+       $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
+
+uninstall-ms-lib:
+       -rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib
+else
+install-ms-lib:
+uninstall-ms-lib:
+endif
+
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here
-LDFLAGS = @STRIP_BEGIN@                                        \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
-       -export-dynamic                                         \
-       -rpath @prefix@/lib                                     \
-       @LIBTOOL_EXPORT_OPTIONS@                                \
-       @PANGO_LIBS@                                            \
-       @GLIB_DEPLIBS@                                          \
-       @more_ldflags@                                          \
-       @more_libs@                                             \
-       -lm                                                     \
+LDFLAGS = @STRIP_BEGIN@                                                \
+       @LDFLAGS@                                                       \
+       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)            \
+       -export-dynamic                                                 \
+       -rpath $(libdir)                                                \
+       $(no_undefined)                                                 \
+       @LIBTOOL_EXPORT_OPTIONS@                                        \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
+       $(gdk_win32_symbols)                                            \
 @STRIP_END@
 
 #
@@ -49,41 +88,47 @@ LDFLAGS = @STRIP_BEGIN@                                     \
 #
 # Note: files added here may need to be be propagated to gdk_headers in gtk/Makefile.am
 #
-gdk_public_h_sources = @STRIP_BEGIN@ \
-       gdk.h           \
-       gdkcc.h         \
-       gdkcolor.h      \
-       gdkcompat.h     \
-       gdkcursor.h     \
-       gdkcursors.h    \
-       gdkdnd.h        \
-       gdkdrawable.h   \
-       gdkevents.h     \
-       gdkfont.h       \
-       gdkgc.h         \
-       gdkkeysyms.h    \
-       gdki18n.h       \
-       gdkim.h         \
-       gdkimage.h      \
-       gdkinput.h      \
-       gdkkeys.h       \
-       gdkpango.h      \
-       gdkpixbuf.h     \
-       gdkpixmap.h     \
-       gdkprivate.h    \
-       gdkproperty.h   \
-       gdkregion.h     \
-       gdkrgb.h        \
-       gdkselection.h  \
-       gdktypes.h      \
-       gdkvisual.h     \
-       gdkwindow.h     \
+gdk_public_h_sources = @STRIP_BEGIN@           \
+       gdk.h                                   \
+       gdkcolor.h                              \
+       gdkcursor.h                             \
+       gdkdisplay.h                            \
+       gdkdnd.h                                \
+       gdkdrawable.h                           \
+       gdkevents.h                             \
+       gdkfont.h                               \
+       gdkgc.h                                 \
+       gdkkeysyms.h                            \
+       gdki18n.h                               \
+       gdkimage.h                              \
+       gdkinput.h                              \
+       gdkkeys.h                               \
+       gdkdisplaymanager.h                     \
+       gdkpango.h                              \
+       gdkpixbuf.h                             \
+       gdkpixmap.h                             \
+       gdkproperty.h                           \
+       gdkregion.h                             \
+       gdkrgb.h                                \
+       gdkscreen.h                             \
+       gdkselection.h                          \
+       gdktypes.h                              \
+       gdkvisual.h                             \
+       gdkwindow.h                             \
+@STRIP_END@
+
+gdk_headers = @STRIP_BEGIN@       \
+       $(gdk_public_h_sources)   \
+       gdkenumtypes.h            \
+       gdkprivate.h              \
 @STRIP_END@
 
 gdk_c_sources = @STRIP_BEGIN@  \
        gdk.c                   \
        gdkcolor.c              \
        gdkcursor.c             \
+       gdkdisplay.c            \
+       gdkdnd.c                \
        gdkdraw.c               \
        gdkevents.c             \
        gdkfont.c               \
@@ -93,6 +138,8 @@ gdk_c_sources = @STRIP_BEGIN@        \
        gdkkeyuni.c             \
        gdkimage.c              \
        gdkinternals.h          \
+       gdkintl.h               \
+       gdkdisplaymanager.c     \
        gdkpango.c              \
        gdkpixbuf-drawable.c    \
        gdkpixbuf-render.c      \
@@ -103,79 +150,103 @@ gdk_c_sources = @STRIP_BEGIN@    \
        gdkrectangle.c          \
        gdkregion-generic.c     \
        gdkregion-generic.h     \
+       gdkscreen.c             \
+       gdkselection.c          \
+       gdkvisual.c             \
        gdkwindow.c             \
 @STRIP_END@
 
 #
 # setup GDK sources and their dependancies
 #
-extra = @gdktargetlib@
-
-if USE_X11
-libgdk_x11_includedir = $(includedir)/gtk-2.0/gdk
-
-libgdk_x11_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la 
-
-libgdk_x11_include_HEADERS = $(gdk_public_h_sources)
-libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources)
-endif
-
-if USE_NANOX
-libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk
-
-libgdk_nanox_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la 
-
-libgdk_nanox_include_HEADERS = $(gdk_public_h_sources)
-libgdk_nanox_1_3_la_SOURCES = $(gdk_c_sources)
-endif
 
-if USE_LINUX_FB
-libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk
+gdkincludedir = $(includedir)/gtk-2.0/gdk
+gdkinclude_HEADERS = $(gdk_headers)
 
-libgdk_linux_fb_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la 
+# gdkmarshalers.c is not here becuase it is currently an empty file
+common_sources = @STRIP_BEGIN@ \
+       $(gdk_c_sources)        \
+       gdkenumtypes.c          \
+       gdkmarshalers.h         \
+@STRIP_END@
 
-libgdk_linux_fb_include_HEADERS = $(gdk_public_h_sources)
-libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources)
-endif
+libgdk_x11_2_0_la_SOURCES = $(common_sources)
+libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
 
-# now define the real one to workaround automake's mishandling
-lib_LTLIBRARIES = $(extra)
+libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la @GDK_DEP_LIBS@
+libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la @GDK_DEP_LIBS@
+libgdk_win32_2_0_la_LIBADD = \
+       win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib) \
+       @GDK_DEP_LIBS@
 
-EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
+lib_LTLIBRARIES = $(gdktargetlib)
 
-MAINTAINERCLEANFILES +=
-EXTRA_HEADERS +=
-EXTRA_DIST +=
-EXTRA_DIST +=
+EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la
 
-#
-# rules to generate built sources
-#
-# we only need to remake these headers once a new X version is released
-X-derived-headers:
-       sed -e 's/^#define[     ]*XC\([^        ]*\)[   ]*\([^  ]*\)[   ]*.*$$/GDK\1 = \2,/' \
-           -e 'tb' -e 'd' -e ':b' \
-           -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-           < @x_includes@/X11/cursorfont.h > gdkcursors.h ; \
-       sed -e 's/^#define[     ]*XK\([^        ]*\)[   ]*\([^  ]*\)[   ]*.*$$/#define GDK\1 \2/' \
-           -e 'tb' -e 'd' -e ':b' -e 's/ 0X/ 0x/' \
-           < @x_includes@/X11/keysymdef.h > gdkkeysyms.h
+MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h
+EXTRA_HEADERS =
 
 #
 # Rule to install gdkconfig.h header file
 #
 configexecincludedir = $(libdir)/gtk-2.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
 
-BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h
+install-exec-hook:
+if DISABLE_EXPLICIT_DEPS
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gdktargetlib)
+endif
+
+#note: not gdkconfig.h
+BUILT_SOURCES = stamp-gc-h
+
+# Generate built header without using automake-1.4 BUILT_SOURCES
+$(libgdk_x11_2_0_la_OBJECTS) $(libgdk_linux_fb_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_OBJECTS): gdkenumtypes.h gdkmarshalers.h
+
+$(srcdir)/gdkenumtypes.h: stamp-gdkenumtypes.h
+       @true
+stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
+       ( cd $(srcdir) && glib-mkenums \
+                       --fhead "#ifndef __GDK_ENUM_TYPES_H__\n#define __GDK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+                       --fprod "/* enumerations from \"@filename@\" */\n" \
+                       --vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+                       --ftail "G_END_DECLS\n\n#endif /* __GDK_ENUM_TYPES_H__ */" \
+               $(gdk_public_h_sources) ) >> xgen-geth \
+       && (cmp -s xgen-geth $(srcdir)/gdkenumtypes.h || cp xgen-geth $(srcdir)/gdkenumtypes.h ) \
+       && rm -f xgen-geth \
+       && echo timestamp > $(@F)
+$(srcdir)/gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
+       ( cd $(srcdir) && glib-mkenums \
+                       --fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"" \
+               --fprod "\n/* enumerations from \"@filename@\" */" \
+                       --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
+                       --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+                       --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+               $(gdk_public_h_sources) ) > xgen-getc \
+       && cp xgen-getc $(srcdir)/gdkenumtypes.c  \
+       && rm -f xgen-getc
+
+# 
+# Marshaller generation
+#
+$(srcdir)/gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
+       cd $(srcdir) &&                                                                                 \
+        ( @GLIB_GENMARSHAL@ --prefix=gdk_marshal gdkmarshalers.list --header > gdkmarshalers.tmp       \
+       && mv gdkmarshalers.tmp gdkmarshalers.h )                                                       \
+        || ( rm -f gdkmarshalers.tmp && exit 1 )
+$(srcdir)/gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
+       cd $(srcdir) &&                                                                                 \
+       $( @GLIB_GENMARSHAL@ --prefix=gdk_marshal gdkmarshalers.list --body > gdkmarshalers.tmp \
+       && mv gdkmarshalers.tmp gdkmarshalers.c )                                                       \
+       || ( rm -f gdkmarshalers.tmp && exit 1 )
+
 gdkconfig.h: stamp-gc-h
        @if test -f gdkconfig.h; then :; \
        else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
@@ -183,6 +254,10 @@ stamp-gc-h: ../config.status
        cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
+install-data-local: install-ms-lib install-libtool-import-lib
+
+uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+
 .PHONY: files
 
 files: