From a413634da8848467f356fa88e5355e6dd88f4bb0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 17 Dec 2025 18:49:52 +0100 Subject: [PATCH] replace DRIVER_NAME autotools symbol by fixed string Signed-off-by: Enrico Weigelt, metux IT consult --- configure.ac | 3 --- man/Makefile.am | 4 ++-- src/Makefile.am | 13 ++++++------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index d7bd9e2..713f360 100644 --- a/configure.ac +++ b/configure.ac @@ -76,9 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) AC_SUBST([sdkdir]) -DRIVER_NAME=evdev -AC_SUBST([DRIVER_NAME]) - AC_CONFIG_FILES([Makefile src/Makefile man/Makefile diff --git a/man/Makefile.am b/man/Makefile.am index 0a7311e..6191c40 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,11 +22,11 @@ drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = $(DRIVER_NAME).man +driverman_PRE = evdev.man driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX)) -EXTRA_DIST = $(DRIVER_NAME).man +EXTRA_DIST = evdev.man CLEANFILES = $(driverman_DATA) diff --git a/src/Makefile.am b/src/Makefile.am index 5e0c3b3..61b8ed0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,17 +28,16 @@ AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBEVDEV_CFLAGS) -@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la -@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS) -@DRIVER_NAME@_drv_ladir = @inputdir@ +evdev_drv_la_LTLIBRARIES = evdev_drv.la +evdev_drv_la_LDFLAGS = -module -avoid-version +evdev_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS) +evdev_drv_ladir = @inputdir@ -@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \ - @DRIVER_NAME@.h \ +evdev_drv_la_SOURCES = evdev.c \ + evdev.h \ emuMB.c \ emuThird.c \ emuWheel.c \ draglock.c \ apple.c \ axis_labels.h -