Commit ef088b50 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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.
parent 4c84db87
## 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:
......
#ifndef __GDK_DRAWABLE_H__
#define __GDK_DRAWABLE_H__
#include <gdktypes.h>
#include <gdk/gdktypes.h>
#ifdef __cplusplus
extern "C" {
......
......@@ -29,6 +29,7 @@
#include <X11/Xutil.h>
#include "config.h"
#include "gdkx.h"
#include "gdkinput.h"
#include "gdkprivate.h"
#include "gdkinputprivate.h"
......
## 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 \
......@@ -29,6 +29,7 @@
#include <X11/Xutil.h>
#include "config.h"
#include "gdkx.h"
#include "gdkinput.h"
#include "gdkprivate.h"
#include "gdkinputprivate.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment