http://marcin-wiacek.fkn.pl/english/zips/mygnokii.tar.gz

[gnokii.git] / gnokiid / Makefile

diff --git a/gnokiid/Makefile b/gnokiid/Makefile
index 0ed1fd4..fde8ac2 100644 (file)
--- a/gnokiid/Makefile
+++ b/gnokiid/Makefile
@@ -12,27 +12,36 @@ include $(TOPDIR)/Makefile.global
 CFLAGS += $(PTHREAD_CFLAGS)
 LDFLAGS += $(PTHREAD_LIBS)
 
-LDFLAGS += -L$(TOPDIR)/common -lgnokii
-
 OBJS = gnokiid.o
 
 all: gnokiid
 
-gnokiid: $(OBJS) $(TOPDIR)/common/data/DATA.o
+gnokiid: $(OBJS) $(TOPDIR)/common/COMMON.o $(TOPDIR)/common/DATA.o
+
+$(TOPDIR)/common/COMMON.o: 
+       $(MAKE) -C $(TOPDIR)/common COMMON.o
+
+$(TOPDIR)/common/DATA.o:
+       $(MAKE) -C $(TOPDIR)/common DATA.o
+
+$(TOPDIR)/common/libmygnokii.so:
+       $(MAKE) -C $(TOPDIR)/common makelib
 
-$(TOPDIR)/common/data/DATA.o:
-       $(MAKE) -C $(TOPDIR)/common/data DATA.o
+makelib: $(OBJS) $(TOPDIR)/common/libmygnokii.so
+       $(CC) $(LDFLAGS) -L$(TOPDIR)/common -lmygnokii $(OBJS) -o gnokiidlib
 
 clean:
-       $(RM) $(OBJS) *~ depend gnokiid *.exe core *.bak
+       $(RM) $(OBJS) *~ depend gnokiid gnokiidlib *.exe core *.bak
 
 install: all
        $(INSTALL) -d $(sbindir)
        $(INSTALL) gnokiid $(sbindir)
+       $(INSTALL) gnokiidlib $(sbindir)/gnokiid
 
 install-strip: all
        $(INSTALL) -d $(sbindir)
        $(INSTALL) -s gnokiid $(sbindir)
+       $(INSTALL) -s gnokiidlib $(sbindir)/gnokiid
        @echo "done"
 
 install-suid: all
@@ -41,6 +50,7 @@ install-suid: all
        fi
        $(INSTALL) -d $(sbindir)
        $(INSTALL) -o root -g gnokii -m 4750 gnokiid $(sbindir)
+       $(INSTALL) -o root -g gnokii -m 4750 gnokiidlib $(sbindir)/gnokiid
        @echo "done"
 
 install-ss: all
@@ -49,6 +59,7 @@ install-ss: all
        fi
        $(INSTALL) -d $(sbindir)
        $(INSTALL) -o root -g gnokii -m 4750 -s gnokiid $(sbindir)
+       $(INSTALL) -o root -g gnokii -m 4750 -s gnokiidlib $(sbindir)/gnokiid
        @echo "done"
 
 depend dep: