From 6de6d53af496783e46eef28ee324a0bb73f07a38 Mon Sep 17 00:00:00 2001 From: Erik von Reis <evonreis@caltech.edu> Date: Thu, 21 Apr 2022 11:22:09 -0700 Subject: [PATCH] gpstime: dkms build now working Modify makefile to work with DKMS. Apparently DKMS silently fails if you try to rearrange the source tree. Build is now back to being in-place, but properly cleans up! --- src/drv/gpstime/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/drv/gpstime/Makefile b/src/drv/gpstime/Makefile index cdc9c3b58..7f1fbaded 100644 --- a/src/drv/gpstime/Makefile +++ b/src/drv/gpstime/Makefile @@ -29,19 +29,15 @@ SYMVERSDIR := /var/cache/$(MODULENAME) obj-m += $(MODULENAME).o $(MODULENAME)-y := $(MODULENAME)_core.o -$(MODULENAME)-y += temp/spectracomGPS.o -$(MODULENAME)-y += temp/symmetricomGps.o -$(MODULENAME)-y += temp/ligoPcieTiming_core.o +$(MODULENAME)-y += ../../include/drv/spectracomGPS.o +$(MODULENAME)-y += ../../include/drv/symmetricomGps.o +$(MODULENAME)-y += ../../include/drv/ligoPcieTiming_core.o ccflags-y += -I$(mkfile_dir)/../../include/ ifeq ($(KERNELRELEASE),) #all: $(MODULENAME)_test all: - mkdir -p temp/ - cp -p $(mkfile_dir)../../include/drv/spectracomGPS.c temp/ - cp -p $(mkfile_dir)../../include/drv/symmetricomGps.c temp/ - cp -p $(mkfile_dir)../../include/drv/ligoPcieTiming_core.c temp/ $(MAKE) -C $(KDIR) M=$(PWD) modules else obj-m := $(MODULENAME).o @@ -89,6 +85,7 @@ test: all ./$(MODULENAME)_test.sh clean: - rm -f *.o *.ko Module.symvers *.mod.c .*.cmd stest modules.order + rm -f *.o *.ko Module.symvers *.mod.c .*.cmd stest modules.order + rm -f ../../include/drv/*.o rm -r temp/ -- GitLab