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

[ion3.git] / utils / ion-statusd / Makefile

diff --git a/utils/ion-statusd/Makefile b/utils/ion-statusd/Makefile
index 0a0afac6e14409def5e48453e31a1546952a7b21..8e5da544ac7ace80f7ae1f2c27645ae52423af88 100644 (file)
--- a/utils/ion-statusd/Makefile
+++ b/utils/ion-statusd/Makefile
@@ -8,19 +8,18 @@ include $(TOPDIR)/build/system-inc.mk
 
 ######################################
 
+EXTRA_EXECUTABLE = ion-statusd
+
+SOURCES = ion-statusd.c exec.c extlrx.c
+
 INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBEXTL_INCLUDES) $(LIBTU_INCLUDES)
 LIBS += $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(LUA_LIBS) $(DL_LIBS) -lm
 CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
 
 DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
            -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
-          -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \
-           -DSTATUSD_LOCATION=\"$(EXTRABINDIR)/ion-statusd\"
+          -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
            
-SOURCES = ion-statusd.c exec.c extlrx.c
-
-TARGETS = ion-statusd
-
 LUA_SOURCES = statusd_date.lua statusd_mail.lua statusd_load.lua
 
 MAKE_EXPORTS = statusd
@@ -33,9 +32,4 @@ include $(TOPDIR)/build/rules.mk
 
 ######################################
 
-ion-statusd: $(OBJS) $(EXT_OBJS)
-       $(CC) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
-
-_install: lc_install
-       $(INSTALLDIR) $(EXTRABINDIR)
-       $(INSTALLBIN) ion-statusd $(EXTRABINDIR)
+_install: lc_install executable_install