X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=pwm%2FMakefile;h=983c51c2a328fcecd186bf97e37482499b1c0fbb;hb=5e1e6e6c4467839ec70cee64dc1faabcf08e2a5f;hp=84c3946182f61dae1ce62666802a09c8afe18c31;hpb=8366314611bf30a0f31d25bf5f5023186fa87692;p=ion3.git

diff --git a/pwm/Makefile b/pwm/Makefile
index 84c3946..983c51c 100644
--- a/pwm/Makefile
+++ b/pwm/Makefile
@@ -11,32 +11,22 @@ include $(TOPDIR)/modulelist.mk
 
 ######################################
 
-SOURCES=pwm.c
+EXECUTABLE = pwm3
 
-ETC = cfg_pwm.lua
+SOURCES = pwm.c
 
-TARGETS = pwm3
+ETC = cfg_pwm.lua
 
 INCLUDES += $(X11_INCLUDES) 
 INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES)
 INCLUDES += -I..
 
-LIBS += $(X11_LIBS) $(XINERAMA_LIBS)
+LIBS += $(X11_LIBS) -lSM -lICE
 LIBS += $(WHOLEA) $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(NO_WHOLEA)
 LIBS += $(LUA_LIBS) $(DL_LIBS)
 LIBS += -lm
 
-ifeq ($(PRELOAD_MODULES),1)
-EXT_OBJS += $(foreach mod, $(PWM_MODULE_LIST), ../$(mod)/$(mod).a)
-DEPEND_DEPENDS += preload.c
-SOURCES += preload.c
-TO_CLEAN += preload.c
-LIBS += -lSM -lICE
-else
-LINKOPTS = $(EXPORT_DYNAMIC)
-WHOLEA = -Wl,-whole-archive
-NO_WHOLEA = -Wl,-no-whole-archive
-endif
+MODULE_PATH = $(TOPDIR)
 
 EXT_OBJS += ../ioncore/ioncore.a
 
@@ -58,15 +48,7 @@ include $(TOPDIR)/build/rules.mk
 
 ######################################
 
-pwm3: $(OBJS) $(EXT_OBJS)
-	$(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
-
-preload.c:
-	$(LUA) ../build/mkpreload.lua $(PWM_MODULE_LIST) > preload.c
-
-_install:
-	$(INSTALLDIR) $(BINDIR)
-	$(INSTALL) -m $(BIN_MODE) pwm3 $(BINDIR)
+_install: executable_install
 	$(INSTALLDIR) $(PWM_ETCDIR)
 	for i in $(ETC); do \
 		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \