X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fgbm%2FMakefile.am;h=bb246ecebf52bd2409e74de01b467dd179a1fef0;hp=918fdf7d6adac7a6d00d2f26b00ba75b44c9a7c2;hb=2fa165e757b917d3818aec73d64f742570ccb78b;hpb=6ee082718fca884fbda73001e0ecb32095409549

diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 918fdf7d6ad..bb246ecebf5 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -1,12 +1,11 @@
-AUTOMAKE_OPTIONS = subdir-objects
+include Makefile.sources
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = main/gbm.pc
 
 AM_CFLAGS = \
-	-D_OS_UNIX=1 \
-	-DMODULEDIR='"$(libdir)/gbm"' \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/loader \
 	-I$(top_srcdir)/src/gbm/main \
 	$(DLOPEN_CFLAGS) \
@@ -17,12 +16,7 @@ lib_LTLIBRARIES = libgbm.la
 include_HEADERS = main/gbm.h
 
 libgbm_la_SOURCES = \
-	main/backend.c \
-	main/backend.h \
-	main/common_drm.h \
-	main/gbm.c \
-	main/gbm.h \
-	main/gbmint.h
+	$(gbm_core_FILES)
 
 libgbm_la_LDFLAGS = \
 	-no-undefined \
@@ -32,31 +26,31 @@ libgbm_la_LDFLAGS = \
 
 libgbm_la_LIBADD = \
 	$(top_builddir)/src/loader/libloader.la \
+	$(top_builddir)/src/util/libmesautil.la \
+	$(top_builddir)/src/util/libxmlconfig.la \
 	$(DLOPEN_LIBS)
 
-if HAVE_EGL_PLATFORM_WAYLAND
-AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
-AM_CFLAGS += $(WAYLAND_CFLAGS)
-libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS)
+if HAVE_PLATFORM_WAYLAND
+AM_CFLAGS += \
+	$(WAYLAND_SERVER_CFLAGS) \
+	-I$(top_srcdir)/src/egl/wayland/wayland-drm/
+libgbm_la_LIBADD += $(WAYLAND_SERVER_LIBS)
 endif
 
 if HAVE_DRI2
-noinst_LTLIBRARIES = libgbm_dri.la
-libgbm_dri_la_SOURCES = \
-	backends/dri/gbm_dri.c \
-	backends/dri/gbm_driint.h
+libgbm_la_SOURCES += \
+	$(gbm_dri_FILES)
 
-libgbm_dri_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_SEARCH_DIR)"' \
-	$(LIBDRM_CFLAGS)
+AM_CFLAGS += \
+	$(LIBDRM_CFLAGS) \
+	$(PTHREADSTUBS_CFLAGS)
 
 libgbm_la_LIBADD += \
-	libgbm_dri.la \
-	$(LIBDRM_LIBS)
+	$(LIBDRM_LIBS) \
+	$(PTHREADSTUBS_LIBS)
 endif
 
 TESTS = gbm-symbols-check
-EXTRA_DIST = gbm-symbols-check
+EXTRA_DIST = gbm-symbols-check meson.build
 
 include $(top_srcdir)/install-lib-links.mk