X-Git-Url: https://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=gnokiid%2FMakefile;fp=gnokiid%2FMakefile;h=ccf0253e38ddaf1832c2bac8ab786a40273b2fc3;hp=fde8ac222dd1f4a9b329a16bdefa9496ca2eabba;hb=1379b6d01c3c3bd082a8ab32433450d8a2f3419c;hpb=a363234939c6030f24d092e9d4d97ee40f50ce03

diff --git a/gnokiid/Makefile b/gnokiid/Makefile
index fde8ac2..ccf0253 100644
--- a/gnokiid/Makefile
+++ b/gnokiid/Makefile
@@ -10,38 +10,30 @@ TOPDIR=..
 include $(TOPDIR)/Makefile.global
 
 CFLAGS	+= $(PTHREAD_CFLAGS)
-LDFLAGS += $(PTHREAD_LIBS)
+LDFLAGS += $(PTHREAD_LIBS) -L../common -lgnokii
 
 OBJS =	gnokiid.o
 
 all: gnokiid
 
-gnokiid: $(OBJS) $(TOPDIR)/common/COMMON.o $(TOPDIR)/common/DATA.o
+gnokiid: $(OBJS) $(TOPDIR)/common/libgnokii.so $(TOPDIR)/common/data/DATA.o
 
-$(TOPDIR)/common/COMMON.o: 
-	$(MAKE) -C $(TOPDIR)/common COMMON.o
+$(TOPDIR)/common/libgnokii.so:
+	$(MAKE) -C $(TOPDIR)/common libgnokii.so
 
-$(TOPDIR)/common/DATA.o:
-	$(MAKE) -C $(TOPDIR)/common DATA.o
-
-$(TOPDIR)/common/libmygnokii.so:
-	$(MAKE) -C $(TOPDIR)/common makelib
-
-makelib: $(OBJS) $(TOPDIR)/common/libmygnokii.so
-	$(CC) $(LDFLAGS) -L$(TOPDIR)/common -lmygnokii $(OBJS) -o gnokiidlib
+$(TOPDIR)/common/data/DATA.o:
+	$(MAKE) -C $(TOPDIR)/common/data DATA.o
 
 clean:
-	$(RM) $(OBJS) *~ depend gnokiid gnokiidlib *.exe core *.bak
+	$(RM) $(OBJS) *~ depend gnokiid *.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
@@ -50,7 +42,6 @@ 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
@@ -59,7 +50,6 @@ 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: