From 5a94e12c38755117782a3be7b3676871edc89416 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 18 Dec 2025 12:31:55 +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 e0459a5..0108747 100644 --- a/configure.ac +++ b/configure.ac @@ -152,9 +152,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) AC_SUBST([sdkdir]) -DRIVER_NAME=libinput -AC_SUBST([DRIVER_NAME]) - AC_CONFIG_FILES([Makefile include/Makefile src/Makefile diff --git a/man/Makefile.am b/man/Makefile.am index edd9313..a84a0e1 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,11 +22,11 @@ drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = $(DRIVER_NAME).man +driverman_PRE = libinput.man driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX)) -EXTRA_DIST = $(DRIVER_NAME).man +EXTRA_DIST = libinput.man CLEANFILES = $(driverman_DATA) diff --git a/src/Makefile.am b/src/Makefile.am index 44d3a9c..48d19f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,12 +28,12 @@ AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBINPUT_CFLAGS) -@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la -@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -@DRIVER_NAME@_drv_la_LIBADD = $(LIBINPUT_LIBS) libdraglock.la libbezier.la -lm -@DRIVER_NAME@_drv_ladir = @inputdir@ +libinput_drv_la_LTLIBRARIES = libinput_drv.la +libinput_drv_la_LDFLAGS = -module -avoid-version +libinput_drv_la_LIBADD = $(LIBINPUT_LIBS) libdraglock.la libbezier.la -lm +libinput_drv_ladir = @inputdir@ -@DRIVER_NAME@_drv_la_SOURCES = \ +libinput_drv_la_SOURCES = \ xf86libinput.c \ util-macros.h \ util-strings.h \