[svn-upgrade] Integrating new upstream version, ion3 (20080207)

[ion3.git] / pwm / Makefile

diff --git a/pwm/Makefile b/pwm/Makefile
index 2721bbfd74f1a170d2363e483de8b6b4f370c8c0..983c51c2a328fcecd186bf97e37482499b1c0fbb 100644 (file)
--- a/pwm/Makefile
+++ b/pwm/Makefile
@@ -11,36 +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)
+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
-LDFLAGS += $(EXPORT_DYNAMIC)
-WHOLEA = -Wl,-whole-archive
-NO_WHOLEA = -Wl,-no-whole-archive
-endif
-
-ifeq ($(RELOCATABLE),1)
-DEFINES += -DCF_RELOCATABLE_PWM3_LOCATION=\"$(BINDIR)/pwm3\"
-endif
+MODULE_PATH = $(TOPDIR)
 
 EXT_OBJS += ../ioncore/ioncore.a
 
@@ -62,15 +48,7 @@ include $(TOPDIR)/build/rules.mk
 
 ######################################
 
-pwm3: $(OBJS) $(EXT_OBJS)
-       $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@
-
-preload.c:
-       $(LUA) ../build/mkpreload.lua $(PWM_MODULE_LIST) > preload.c
-
-_install:
-       $(INSTALLDIR) $(BINDIR)
-       $(INSTALLBIN) pwm3 $(BINDIR)
+_install: executable_install
        $(INSTALLDIR) $(PWM_ETCDIR)
        for i in $(ETC); do \
                $(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \