From 489de843c87f1002519e9c54b9f92635b32897b2 Mon Sep 17 00:00:00 2001 From: Bob Polis Date: Mon, 25 Jan 2021 19:56:38 +0100 Subject: [PATCH] Fixed build, install & clean for modules --- Makefile | 4 ++-- modules/fading-rects/Makefile | 2 +- modules/huey/Makefile | 2 +- modules/rects/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ac7b7fb..061f0d8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BIN := $(shell basename $$(pwd)) -PLUGINS := rects huey fading-rects +PLUGINS := $(wildcard modules/*) MAKE += --no-print-directory @@ -51,7 +51,7 @@ modules: $(PLUGINS) @for plug in $(PLUGINS) ;\ do \ cd $$plug && $(MAKE) && $(MAKE) install ;\ - cd .. ;\ + cd ../.. ;\ done clean: diff --git a/modules/fading-rects/Makefile b/modules/fading-rects/Makefile index 5309f6f..1fc6883 100644 --- a/modules/fading-rects/Makefile +++ b/modules/fading-rects/Makefile @@ -14,7 +14,7 @@ else REALNAME := $(SONAME).$(MINOR) endif -PREFIX ?= .. +PREFIX ?= ../.. LIBDIR ?= $(PREFIX)/plugins SRCS := $(wildcard *.cpp) diff --git a/modules/huey/Makefile b/modules/huey/Makefile index 5309f6f..1fc6883 100644 --- a/modules/huey/Makefile +++ b/modules/huey/Makefile @@ -14,7 +14,7 @@ else REALNAME := $(SONAME).$(MINOR) endif -PREFIX ?= .. +PREFIX ?= ../.. LIBDIR ?= $(PREFIX)/plugins SRCS := $(wildcard *.cpp) diff --git a/modules/rects/Makefile b/modules/rects/Makefile index 5309f6f..1fc6883 100644 --- a/modules/rects/Makefile +++ b/modules/rects/Makefile @@ -14,7 +14,7 @@ else REALNAME := $(SONAME).$(MINOR) endif -PREFIX ?= .. +PREFIX ?= ../.. LIBDIR ?= $(PREFIX)/plugins SRCS := $(wildcard *.cpp)