configure.in gdk/Makefile.am gtk/Makefile.am gtk/gtkselection.c

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 3aafb1a4b68ef40cbd86686daef52568448b4d56..a36f36afc0e702ab2f37e508aac1045401ef74f7 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,13 +1,14 @@
 ## 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       \
+       makeenums.pl            \
        makefile.msc
 
 common_includes = @STRIP_BEGIN@        \
@@ -16,11 +17,7 @@ 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@                \
 @STRIP_END@
 
 INCLUDES = $(common_includes)
@@ -34,11 +31,8 @@ LDFLAGS = @STRIP_BEGIN@                                      \
        -export-dynamic                                         \
        -rpath @prefix@/lib                                     \
        @LIBTOOL_EXPORT_OPTIONS@                                \
-       @PANGO_LIBS@                                            \
-       @GLIB_DEPLIBS@                                          \
-       @more_ldflags@                                          \
-       @more_libs@                                             \
-       -lm                                                     \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la         \
+       @GDK_DEP_LIBS@                                          \
 @STRIP_END@
 
 #
@@ -52,7 +46,6 @@ LDFLAGS = @STRIP_BEGIN@                                       \
 gdk_public_h_sources = @STRIP_BEGIN@ \
        gdk.h           \
        gdkcolor.h      \
-       gdkcompat.h     \
        gdkcursor.h     \
        gdkcursors.h    \
        gdkdnd.h        \
@@ -62,14 +55,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 +70,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              \
@@ -116,18 +113,8 @@ 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)
+libgdk_x11_include_HEADERS = $(gdk_headers)
+libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
 endif
 
 if USE_LINUX_FB
@@ -136,19 +123,17 @@ 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)
+libgdk_linux_fb_include_HEADERS = $(gdk_headers)
+libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
 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
 
-MAINTAINERCLEANFILES +=
-EXTRA_HEADERS +=
-EXTRA_DIST +=
-EXTRA_DIST +=
+MAINTAINERCLEANFILES =
+EXTRA_HEADERS =
 
 #
 # rules to generate built sources
@@ -174,7 +159,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