]> Pileus Git - ~andy/gtk/blobdiff - gdk/Makefile.am
Update version to 2.0.0
[~andy/gtk] / gdk / Makefile.am
index 02f7333b26992343346511f5e882341f4b302c25..8bba21f69b763cc465e6797160bb55ff95ee3f20 100644 (file)
@@ -1,13 +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 \
-       makefile.mingw.in \
+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@        \
@@ -16,29 +17,65 @@ 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
+
+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)/libdk-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                                     \
-       -L../gdk-pixbuf/.libs -lgdk_pixbuf                      \
-       @PANGO_LIBS@                                            \
-       @GLIB_DEPLIBS@                                          \
-       @more_ldflags@                                          \
-       @more_libs@                                             \
-       -lm                                                     \
+LDFLAGS = @STRIP_BEGIN@                                                \
+       -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)     \
+       $(gdk_win32_symbols)                                            \
+       @GDK_DEP_LIBS@                                                  \
 @STRIP_END@
 
 #
@@ -51,11 +88,8 @@ LDFLAGS = @STRIP_BEGIN@                                      \
 #
 gdk_public_h_sources = @STRIP_BEGIN@ \
        gdk.h           \
-       gdkcc.h         \
        gdkcolor.h      \
-       gdkcompat.h     \
        gdkcursor.h     \
-       gdkcursors.h    \
        gdkdnd.h        \
        gdkdrawable.h   \
        gdkevents.h     \
@@ -63,13 +97,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        \
@@ -79,6 +112,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              \
@@ -88,6 +127,7 @@ gdk_c_sources = @STRIP_BEGIN@        \
        gdkfont.c               \
        gdkgc.c                 \
        gdkglobals.c            \
+       gdkkeys.c               \
        gdkkeyuni.c             \
        gdkimage.c              \
        gdkinternals.h          \
@@ -107,73 +147,57 @@ gdk_c_sources = @STRIP_BEGIN@     \
 #
 # 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 
+gdkincludedir = $(includedir)/gtk-2.0/gdk
+gdkinclude_HEADERS = $(gdk_headers)
 
-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
-
-libgdk_linux_fb_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la 
-
-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 = $(gdk_c_sources) gdkenumtypes.c
+libgdk_linux_fb_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
+libgdk_win32_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
 
-# now define the real one to workaround automake's mishandling
-lib_LTLIBRARIES = $(extra)
+libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la   
+libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la    
+libgdk_win32_2_0_la_LIBADD = \
+       win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib)
 
-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 =
+EXTRA_HEADERS =
 
 #
 # Rule to install gdkconfig.h header file
 #
 configexecincludedir = $(libdir)/gtk-2.0/include
 #configexecinclude_DATA = gdkconfig.h
-install-exec-local: gdkconfig.h
+
+if DISABLE_EXPLICIT_DEPS
+sanitize-la: 
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gdktargetlib)
+else
+sanitize-la: 
+       @true
+endif
+
+install-exec-local: gdkconfig.h sanitize-la
        $(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
+#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
@@ -181,8 +205,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