From 34a615018844814d285c9c787ff46539b8adc9aa Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 24 Aug 2012 11:44:57 -0700 Subject: [PATCH] radeon/winsys: Convert to automake --- configure.ac | 1 + src/gallium/winsys/radeon/drm/.gitignore | 1 + src/gallium/winsys/radeon/drm/Makefile | 15 --------------- src/gallium/winsys/radeon/drm/Makefile.am | 15 +++++++++++++++ 4 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 src/gallium/winsys/radeon/drm/.gitignore delete mode 100644 src/gallium/winsys/radeon/drm/Makefile create mode 100644 src/gallium/winsys/radeon/drm/Makefile.am diff --git a/configure.ac b/configure.ac index 5cc611ff8b0..354635b1377 100644 --- a/configure.ac +++ b/configure.ac @@ -2010,6 +2010,7 @@ AC_CONFIG_FILES([configs/current src/gallium/targets/Makefile src/gallium/targets/opencl/Makefile src/gallium/winsys/Makefile + src/gallium/winsys/radeon/drm/Makefile src/gbm/Makefile src/gbm/main/gbm.pc src/glsl/Makefile diff --git a/src/gallium/winsys/radeon/drm/.gitignore b/src/gallium/winsys/radeon/drm/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/winsys/radeon/drm/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/winsys/radeon/drm/Makefile b/src/gallium/winsys/radeon/drm/Makefile deleted file mode 100644 index 517360e4364..00000000000 --- a/src/gallium/winsys/radeon/drm/Makefile +++ /dev/null @@ -1,15 +0,0 @@ - -TOP = ../../../../.. -include $(TOP)/configs/current - -LIBNAME = radeonwinsys - -# get C_SOURCES -include Makefile.sources - -LIBRARY_INCLUDES = -I$(TOP)/include \ - $(shell $(PKG_CONFIG) libdrm --cflags-only-I) - -include ../../../Makefile.template - -symlinks: diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am new file mode 100644 index 00000000000..5b2506b35eb --- /dev/null +++ b/src/gallium/winsys/radeon/drm/Makefile.am @@ -0,0 +1,15 @@ +include Makefile.sources +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + -I$(top_srcdir)/include \ + $(GALLIUM_CFLAGS) \ + $(RADEON_CFLAGS) + +noinst_LTLIBRARIES = libradeonwinsys.la + +libradeonwinsys_la_SOURCES = $(C_SOURCES) + +#XXX: Delete this when all targets using the radeon winsys are converted to automake. +all-local: libradeonwinsys.la + ln -f $(builddir)/.libs/libradeonwinsys.a $(builddir)/libradeonwinsys.a -- 2.30.2