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

build: Move src/Makefile.am into toplevel Makefile.am

Browse source
This commit is contained in:
Kristian Høgsberg 2014-03-06 23:45:56 -08:00
parent 267b28887d
commit 4c163b9b00
4 changed files with 92 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

95
Makefile.am
View file

@ -2,7 +2,7 @@ if BUILD_DOCS
doc_subdir = doc
endif
SUBDIRS = src $(doc_subdir) tests
SUBDIRS = $(doc_subdir) . tests
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@ -14,9 +14,93 @@ dist_pkgdata_DATA = \
protocol/wayland.xml \
protocol/wayland.dtd
lib_LTLIBRARIES = libwayland-cursor.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
include_HEADERS = cursor/wayland-cursor.h
lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
noinst_LTLIBRARIES = libwayland-util.la
include_HEADERS = \
src/wayland-util.h \
src/wayland-server-protocol.h \
src/wayland-server.h \
src/wayland-client-protocol.h \
src/wayland-client.h \
src/wayland-egl.h \
src/wayland-version.h
libwayland_util_la_SOURCES = \
src/connection.c \
src/wayland-util.c \
src/wayland-util.h \
src/wayland-os.c \
src/wayland-os.h \
src/wayland-private.h
libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) -pthread
libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
libwayland_server_la_LDFLAGS = -version-info 1:0:1
libwayland_server_la_SOURCES = \
src/wayland-server.c \
src/wayland-shm.c \
src/event-loop.c
nodist_libwayland_server_la_SOURCES = \
protocol/wayland-protocol.c
libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(GCC_CFLAGS) -pthread
libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
libwayland_client_la_LDFLAGS = -version-info 2:0:2
libwayland_client_la_SOURCES = \
src/wayland-client.c
nodist_libwayland_client_la_SOURCES = \
protocol/wayland-protocol.c
pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
protocoldir = $(top_srcdir)/protocol
if ENABLE_SCANNER
wayland_scanner = $(top_builddir)/wayland-scanner
else
wayland_scanner = wayland-scanner
endif
protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@
protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header < $< > $@
protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
if ENABLE_SCANNER
bin_PROGRAMS = wayland-scanner
wayland_scanner_SOURCES = src/scanner.c
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
$(BUILT_SOURCES) : wayland-scanner
pkgconfig_DATA += src/wayland-scanner.pc
endif
BUILT_SOURCES = \
$(nodist_libwayland_server_la_SOURCES) \
$(nodist_libwayland_client_la_SOURCES)
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = src/wayland-version.h
EXTRA_DIST = src/wayland-version.h.in
lib_LTLIBRARIES += libwayland-cursor.la
include_HEADERS += cursor/wayland-cursor.h
libwayland_cursor_la_SOURCES = \
cursor/wayland-cursor.c \
@ -25,10 +109,9 @@ libwayland_cursor_la_SOURCES = \
cursor/cursor-data.h \
cursor/xcursor.c \
cursor/xcursor.h
libwayland_cursor_la_LIBADD = src/libwayland-client.la
libwayland_cursor_la_LIBADD = libwayland-client.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = cursor/wayland-cursor.pc
pkgconfig_DATA += cursor/wayland-cursor.pc
libwayland_cursor_la_CFLAGS = \
$(GCC_CFLAGS) \

1
configure.ac
View file

@ -133,7 +133,6 @@ AC_CONFIG_FILES([Makefile
doc/publican/Makefile
doc/doxygen/Makefile
doc/man/Makefile
src/Makefile
src/wayland-server-uninstalled.pc
src/wayland-client-uninstalled.pc
src/wayland-scanner-uninstalled.pc

72
src/Makefile.am
View file

@ -1,72 +0,0 @@
lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
noinst_LTLIBRARIES = libwayland-util.la
include_HEADERS = \
wayland-util.h \
wayland-server-protocol.h \
wayland-server.h \
wayland-client-protocol.h \
wayland-client.h \
wayland-egl.h \
wayland-version.h
libwayland_util_la_SOURCES = \
connection.c \
wayland-util.c \
wayland-util.h \
wayland-os.c \
wayland-os.h \
wayland-private.h
libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
libwayland_server_la_LDFLAGS = -version-info 1:0:1
libwayland_server_la_SOURCES = \
wayland-protocol.c \
wayland-server.c \
wayland-shm.c \
event-loop.c
libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
libwayland_client_la_LDFLAGS = -version-info 2:0:2
libwayland_client_la_SOURCES = \
wayland-protocol.c \
wayland-client.c
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wayland-client.pc wayland-server.pc
AM_CPPFLAGS = $(FFI_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) -pthread
protocoldir = $(top_srcdir)/protocol
if ENABLE_SCANNER
wayland_scanner = $(top_builddir)/src/wayland-scanner
else
wayland_scanner = wayland-scanner
endif
include $(top_srcdir)/src/scanner.mk
if ENABLE_SCANNER
bin_PROGRAMS = wayland-scanner
wayland_scanner_SOURCES = \
scanner.c
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
$(BUILT_SOURCES) : wayland-scanner
scannerpkgconfigdir = $(datadir)/pkgconfig
scannerpkgconfig_DATA = wayland-scanner.pc
endif
BUILT_SOURCES = \
wayland-server-protocol.h \
wayland-client-protocol.h \
wayland-protocol.c
CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = wayland-version.h
EXTRA_DIST = wayland-version.h.in

6
tests/Makefile.am
View file

@ -46,9 +46,9 @@ os_wrappers_test_SOURCES = \
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS)
LDADD = $(top_builddir)/src/libwayland-util.la \
$(top_builddir)/src/libwayland-client.la \
$(top_builddir)/src/libwayland-server.la \
LDADD = ../libwayland-util.la \
../libwayland-client.la \
../libwayland-server.la \
-lrt -ldl $(FFI_LIBS)
exec_fd_leak_checker_SOURCES = \