mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'nobled/for-krh'

Browse source
This commit is contained in:
Kristian Høgsberg 2011-01-25 10:17:16 -05:00
commit 4d6ff297c8
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
clients/Makefile.am
View file

@ -16,8 +16,8 @@ noinst_LTLIBRARIES = libtoytoolkit.la
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \ -DDATADIR='"$(datadir)"' \
-I$(top_srcdir)/wayland \
-I$(top_builddir)/wayland \ -I$(top_builddir)/wayland \
-I$(top_srcdir)/wayland \
$(CLIENT_CFLAGS) $(CLIENT_CFLAGS)
libtoytoolkit_la_SOURCES = \ libtoytoolkit_la_SOURCES = \

6
compositor/Makefile.am
View file

@ -1,12 +1,12 @@
noinst_PROGRAMS = compositor noinst_PROGRAMS = compositor
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir)/wayland \ -DDATADIR='"$(datadir)"' \
-I$(top_builddir)/wayland \ -I$(top_builddir)/wayland \
-I$(top_srcdir)/wayland \
$(COMPOSITOR_CFLAGS) $(COMPOSITOR_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = -DDATADIR='"$(datadir)"'
compositor_LDADD = \ compositor_LDADD = \
$(top_builddir)/wayland/libwayland-server.la \ $(top_builddir)/wayland/libwayland-server.la \

2
wayland/Makefile.am
View file

@ -29,7 +29,7 @@ libwayland_client_la_SOURCES = \
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wayland-client.pc wayland-server.pc pkgconfig_DATA = wayland-client.pc wayland-server.pc
INCLUDES = $(FFI_CFLAGS) AM_CPPFLAGS = $(FFI_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
include $(top_srcdir)/wayland/scanner.mk include $(top_srcdir)/wayland/scanner.mk