[ Merges from gtk-1-2 ]

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 3037fd6de7046e036df25f046ff1531ece69be52..39f07bbfaace07d934e0937e4ee46772a49f4775 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,19 +1,58 @@
-## Process this file with automake to produce Makefile.in
-
-gdkincludedir = $(includedir)/gdk
-
-lib_LTLIBRARIES = libgdk-1.1.la
-
-libgdk_1_1_la_SOURCES = \
+## Makefile.am for gtk+/gdk
+
+INCLUDES = @STRIP_BEGIN@ \
+       -DG_LOG_DOMAIN=\"Gdk\"  \
+       -I$(top_srcdir)         \
+       @GTK_DEBUG_FLAGS@       \
+       @GTK_XIM_FLAGS@         \
+       @GTK_LOCALE_FLAGS@      \
+       @GLIB_CFLAGS@           \
+       @x_cflags@              \
+@STRIP_END@
+
+#
+# libraries to compile and install
+#
+lib_LTLIBRARIES = libgdk.la
+
+# libtool stuff: set version and export symbols for resolving
+libgdkincludedir = $(includedir)/gdk
+libgdk_la_LDFLAGS = @STRIP_BEGIN@ \
+       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+       -release $(LT_RELEASE) \
+       -export-dynamic \
+       @GLIB_DEPLIBS@  \
+       @x_ldflags@     \
+       @x_libs@        \
+       -lm             \
+@STRIP_END@
+
+#
+# setup source file variables
+#
+# GDK header files for public installation (non-generated)
+gdk_public_h_sources = @STRIP_BEGIN@ \
+       gdk.h           \
+       gdkcursors.h    \
+       gdkrgb.h        \
+       gdki18n.h       \
+       gdkkeysyms.h    \
+       gdkprivate.h    \
+       gdktypes.h      \
+       gdkx.h          \
+@STRIP_END@
+gdk_c_sources = @STRIP_BEGIN@ \
        gdk.c           \
        gdkcc.c         \
        gdkcolor.c      \
        gdkcursor.c     \
        gdkdnd.c        \
        gdkdraw.c       \
+       gdkevents.c     \
        gdkfont.c       \
        gdkgc.c         \
        gdkglobals.c    \
+       gdkim.c         \
        gdkimage.c      \
        gdkinput.c      \
        gdkinput.h      \
@@ -23,6 +62,7 @@ libgdk_1_1_la_SOURCES = \
        gdkinputxfree.h \
        gdkpixmap.c     \
        gdkproperty.c   \
+       gdkrgb.c        \
        gdkrectangle.c  \
        gdkregion.c     \
        gdkselection.c  \
@@ -32,46 +72,65 @@ libgdk_1_1_la_SOURCES = \
        MwmUtil.h       \
        gxid_lib.h      \
        gxid_proto.h    \
-        gxid_lib.c
-## this last one is ifdef'd out unless XINPUT_GXI is defined
-## It's easier than trying to get automake to handle compiling
-## it conditionally
-
-gdkinclude_HEADERS = \
-       gdk.h           \
-       gdkcursors.h    \
-       gdki18n.h       \
-       gdkkeysyms.h    \
-       gdkprivate.h    \
-       gdktypes.h      \
-       gdkx.h
-
-libgdk_1_1_la_LDFLAGS = \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       @x_ldflags@ @x_libs@
-
-INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ 
-
+        gxid_lib.c     \
+@STRIP_END@
+
+#
+# setup GDK sources and their dependancies
+#
+libgdkinclude_HEADERS = $(gdk_public_h_sources)
+libgdk_la_SOURCES = $(gdk_c_sources)
+MAINTAINERCLEANFILES +=
+EXTRA_HEADERS +=
+EXTRA_DIST +=
+EXTRA_DIST +=
+
+#
+# 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
+
+#
+# Rule to install gdkconfig.h header file
+#
+configexecincludedir = $(pkglibdir)/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
+gdkconfig.h: stamp-gc-h
+       @if test -f gdkconfig.h; then :; \
+       else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
+stamp-gc-h: ../config.status
+       cd .. && CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=gdk/gdkconfig.h ./config.status
+       echo timestamp > stamp-gc-h
+
+#
+# extra programs
+#
 EXTRA_PROGRAMS = gxid
-
 bin_PROGRAMS = @xinput_progs@
-
-gxid_SOURCES = gxid.c
-
-gxid_LDADD = \
+LDADDS = @STRIP_BEGIN@ \
        @x_ldflags@     \
        @x_libs@        \
-       -lm
-
-BUILT_SOURCES = gdkcursors.h gdkkeysyms.h
-
-EXTRA_DIST = makecursors.awk makekeysyms.awk
-
-gdkcursors.h:
-       awk -f $(srcdir)/makecursors.awk @x_includes@/X11/cursorfont.h > $@
+       @GLIB_LIBS@     \
+       -lm             \
+@STRIP_END@
+gxid_SOURCES = gxid.c
+gxid_LDADD = $(LDADDS)
 
-gdkkeysyms.h:
-       awk -f $(srcdir)/makekeysyms.awk @x_includes@/X11/keysymdef.h > $@
 
 .PHONY: files