diff options
| author | Owen Taylor <otaylor@redhat.com> | 1999-10-03 18:09:00 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1999-10-03 18:09:00 +0000 |
| commit | ef088b50ab73aa19e59c0e1391921670fbb1dd81 (patch) | |
| tree | dfa8f98ded0dfc641b554eb8501a167026319266 | |
| parent | 4c84db87d9081ce8d12b85383be357703a1243be (diff) | |
| download | gdk-pixbuf-ef088b50ab73aa19e59c0e1391921670fbb1dd81.tar.gz | |
Include gdk/gdkdrawable.h with gdk/ prefix. (Pointed out by
Sun Oct 3 14:16:23 1999 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdrawable.h: Include gdk/gdkdrawable.h with
gdk/ prefix. (Pointed out by chak@is.tsukuba.ac.jp)
* x11/: create x-specific subdirectory.
| -rw-r--r-- | gdk/Makefile.am | 23 | ||||
| -rw-r--r-- | gdk/gdkdrawable.h | 2 | ||||
| -rw-r--r-- | gdk/gdkinput.c | 1 | ||||
| -rw-r--r-- | gdk/x11/Makefile.am | 36 | ||||
| -rw-r--r-- | gdk/x11/gdkinput.c | 1 |
5 files changed, 44 insertions, 19 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 5962d18c8..79311c8c1 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,5 +1,7 @@ ## Makefile.am for gtk+/gdk +SUBDIRS=x11 + INCLUDES = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"Gdk\" \ -I$(top_srcdir) \ @@ -27,6 +29,9 @@ libgdk_la_LDFLAGS = @STRIP_BEGIN@ \ -lm \ @STRIP_END@ +libgdk_la_LIBADD = \ + x11/libgdk-x11.la + # # setup source file variables # @@ -91,9 +96,6 @@ gdk_c_sources = @STRIP_BEGIN@ \ gdkwindow.c \ gdkxid.c \ MwmUtil.h \ - gxid_lib.h \ - gxid_proto.h \ - gxid_lib.c \ @STRIP_END@ # @@ -138,21 +140,6 @@ 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@ -LDADDS = @STRIP_BEGIN@ \ - @x_ldflags@ \ - @x_libs@ \ - @GLIB_LIBS@ \ - -lm \ -@STRIP_END@ -gxid_SOURCES = gxid.c -gxid_LDADD = $(LDADDS) - - .PHONY: files files: diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index d4fd6eeb4..30b217264 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -1,7 +1,7 @@ #ifndef __GDK_DRAWABLE_H__ #define __GDK_DRAWABLE_H__ -#include <gdktypes.h> +#include <gdk/gdktypes.h> #ifdef __cplusplus extern "C" { diff --git a/gdk/gdkinput.c b/gdk/gdkinput.c index 8f7533006..874a6cafe 100644 --- a/gdk/gdkinput.c +++ b/gdk/gdkinput.c @@ -29,6 +29,7 @@ #include <X11/Xutil.h> #include "config.h" +#include "gdkx.h" #include "gdkinput.h" #include "gdkprivate.h" #include "gdkinputprivate.h" diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am new file mode 100644 index 000000000..1da1965a5 --- /dev/null +++ b/gdk/x11/Makefile.am @@ -0,0 +1,36 @@ +## Process this file with automake to produce Makefile.in + +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@ + +LDADDS = @STRIP_BEGIN@ \ + @x_ldflags@ \ + @x_libs@ \ + @GLIB_LIBS@ \ + -lm \ +@STRIP_END@ + +noinst_LTLIBRARIES = libgdk-x11.la + +libgdk_x11_la_SOURCES = \ + gxid_lib.c \ + gxid_lib.h \ + gxid_proto.h + +EXTRA_PROGRAMS = gxid +bin_PROGRAMS = @xinput_progs@ + +gxid_SOURCES = gxid.c +gxid_LDADD = $(LDADDS) + +#EXTRA_DIST = \ +# MwmUtil.h \ + + diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c index 8f7533006..874a6cafe 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -29,6 +29,7 @@ #include <X11/Xutil.h> #include "config.h" +#include "gdkx.h" #include "gdkinput.h" #include "gdkprivate.h" #include "gdkinputprivate.h" |