From f6796afca2fe9cb82707c913291bab6c7728740c Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 18 Dec 2025 13:03:08 +0100 Subject: [PATCH] configure.ac: replace DRIVER_NAME symbol by actual name Signed-off-by: Enrico Weigelt, metux IT consult --- configure.ac | 3 --- man/Makefile.am | 4 ++-- src/Makefile.am | 10 +++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 8bd2a23..a47dce3 100644 --- a/configure.ac +++ b/configure.ac @@ -36,9 +36,6 @@ AM_INIT_AUTOMAKE([foreign dist-xz]) # Initialize libtool LT_INIT([disable-static]) -DRIVER_NAME=void -AC_SUBST([DRIVER_NAME]) - # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) diff --git a/man/Makefile.am b/man/Makefile.am index 0f8870b..c8ddeb4 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,10 +22,10 @@ # drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = @DRIVER_NAME@.man +driverman_PRE = void.man driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) -EXTRA_DIST = @DRIVER_NAME@.man +EXTRA_DIST = void.man CLEANFILES = $(driverman_DATA) SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man diff --git a/src/Makefile.am b/src/Makefile.am index 7728677..91fc099 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,9 +25,9 @@ # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) -@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la -@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -@DRIVER_NAME@_drv_la_LIBADD = $(XORG_LIBS) -@DRIVER_NAME@_drv_ladir = @inputdir@ +void_drv_la_LTLIBRARIES = void_drv.la +void_drv_la_LDFLAGS = -module -avoid-version +void_drv_la_LIBADD = $(XORG_LIBS) +void_drv_ladir = @inputdir@ -@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c +void_drv_la_SOURCES = void.c