]> Pileus Git - ~andy/gtk/blobdiff - gdk/Makefile.am
Updates.
[~andy/gtk] / gdk / Makefile.am
index d4b3e924f7bbf4b6a691829335901d0df8f5ea7e..debc9860ebda6deb93380f5ffb511b69bdb2bd3b 100644 (file)
@@ -1,12 +1,14 @@
 ## Makefile.am for gtk+/gdk
 
 SUBDIRS=$(gdktarget)
-DIST_SUBDIRS=linux-fb nanox win32 x11
-
-EXTRA_DIST =   \
-       gdkconfig.h.win32 \
-       gdk.def \
-       makefile.mingw \
+DIST_SUBDIRS=linux-fb win32 x11
+
+EXTRA_DIST =                   \
+       gdkconfig.h.win32       \
+       gdk.def                 \
+       makefile.mingw          \
+       makefile.mingw.in       \
+       makeenums.pl            \
        makefile.msc
 
 common_includes = @STRIP_BEGIN@        \
@@ -15,16 +17,49 @@ common_includes = @STRIP_BEGIN@     \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk-pixbuf      \
        @GTK_DEBUG_FLAGS@               \
-       @GTK_XIM_FLAGS@                 \
-       @GTK_LOCALE_FLAGS@              \
-       @PANGO_CFLAGS@                  \
-       @GLIB_CFLAGS@                   \
-       @more_cflags@                   \
+       @GDK_DEP_CFLAGS@                \
+       -DGDK_COMPILATION               \
 @STRIP_END@
 
 INCLUDES = $(common_includes)
 gtarget=@gdktarget@
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+
+if HAVE_WINTAB
+wintab_lib = -Lwin32 -lwntab32x
+endif
+endif
+
+if OS_WIN32
+gdk_win32_symbols = -export-symbols gdk.def
+
+install-libtool-import-lib:
+       $(INSTALL) .libs/libgdk-win32-1.3.dll.a $(DESTDIR)$(libdir)
+uninstall-libtool-import-lib:
+       -rm $(DESTDIR)$(libdir)/libdk-win32-1.3.dll.a
+else
+install-libtool-import-lib:
+uninstall-libtool-import-lib:
+endif
+
+if MS_LIB_AVAILABLE
+noinst_DATA = gdk-win32-1.3.lib
+
+gdk-win32-1.3.lib: libgdk-win32-1.3.la gdk.def
+       lib -name:libgdk-win32-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
+
+install-ms-lib:
+       $(INSTALL) gdk-win32-1.3.lib $(DESTDIR)$(libdir)
+
+uninstall-ms-lib:
+       -rm $(DESTDIR)$(libdir)/gdk-win32-1.3.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
@@ -32,11 +67,10 @@ LDFLAGS = @STRIP_BEGIN@                                     \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
        -export-dynamic                                         \
        -rpath @prefix@/lib                                     \
-       @PANGO_LIBS@                                            \
-       @GLIB_DEPLIBS@                                          \
-       @more_ldflags@                                          \
-       @more_libs@                                             \
-       -lm                                                     \
+       $(no_undefined)                                         \
+       @LIBTOOL_EXPORT_OPTIONS@                                \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la         \
+       @GDK_DEP_LIBS@                                          \
 @STRIP_END@
 
 #
@@ -49,9 +83,7 @@ LDFLAGS = @STRIP_BEGIN@                                       \
 #
 gdk_public_h_sources = @STRIP_BEGIN@ \
        gdk.h           \
-       gdkcc.h         \
        gdkcolor.h      \
-       gdkcompat.h     \
        gdkcursor.h     \
        gdkcursors.h    \
        gdkdnd.h        \
@@ -61,13 +93,12 @@ gdk_public_h_sources = @STRIP_BEGIN@ \
        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        \
@@ -77,6 +108,12 @@ gdk_public_h_sources = @STRIP_BEGIN@ \
        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              \
@@ -86,6 +123,7 @@ gdk_c_sources = @STRIP_BEGIN@        \
        gdkfont.c               \
        gdkgc.c                 \
        gdkglobals.c            \
+       gdkkeys.c               \
        gdkkeyuni.c             \
        gdkimage.c              \
        gdkinternals.h          \
@@ -113,39 +151,40 @@ 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)
+libgdk_x11_include_HEADERS = $(gdk_headers)
+libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
 endif
 
-if USE_NANOX
-libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk
+if USE_LINUX_FB
+libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk
 
-libgdk_nanox_1_3_la_LIBADD = \
+libgdk_linux_fb_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)
+libgdk_linux_fb_include_HEADERS = $(gdk_headers)
+libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
 endif
 
-if USE_LINUX_FB
-libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk
+if USE_WIN32
+libgdk_win32_includedir = $(includedir)/gtk-2.0/gdk
 
-libgdk_linux_fb_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la 
+libgdk_win32_1_3_la_LIBADD = \
+       $(gtarget)/libgdk-$(gtarget).la $(wintab_lib)
+
+libgdk_win32_include_HEADERS = $(gdk_headers)
+libgdk_win32_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
+
+libgdk_win32_1_3_la_LDFLAGS = $(gdk_win32_symbols)
 
-libgdk_linux_fb_include_HEADERS = $(gdk_public_h_sources)
-libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources)
 endif
 
 # now define the real one to workaround automake's mishandling
 lib_LTLIBRARIES = $(extra)
 
-EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
+EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-linux-fb-1.3.la libgdk-win32-1.3.la
 
-MAINTAINERCLEANFILES +=
-EXTRA_HEADERS +=
-EXTRA_DIST +=
-EXTRA_DIST +=
+MAINTAINERCLEANFILES =
+EXTRA_HEADERS =
 
 #
 # rules to generate built sources
@@ -171,7 +210,17 @@ install-exec-local: 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
+#note: not gdkconfig.h
+BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
+
+gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) $(srcdir)/makeenums.pl
+       cd $(srcdir) \
+       && $(PERL) ./makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
+
+gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) $(srcdir)/makeenums.pl
+       cd $(srcdir) \
+       && $(PERL) ./makeenums.pl cfile $(gdk_public_h_sources) > gdkenumtypes.c
+
 gdkconfig.h: stamp-gc-h
        @if test -f gdkconfig.h; then :; \
        else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
@@ -179,8 +228,9 @@ stamp-gc-h: ../config.status
        cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk/makefile.mingw.in
-       cd $(top_builddir) && CONFIG_FILES=gdk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+install-data-local: install-ms-lib install-libtool-import-lib
+
+uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
 
 .PHONY: files