X-Git-Url: http://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=gnokii%2FMakefile;fp=gnokii%2FMakefile;h=9783b4261a332eecb83924e6dc4466a4534afc4b;hp=2018e7d3befb5eb1870674170d7885acd8b87559;hb=c7dcdfd34d2bed9cc64c5c9603e51ef8c8271951;hpb=2d4a2c4357d6c4070e4a98128b22b89a7b8d7636

diff --git a/gnokii/Makefile b/gnokii/Makefile
index 2018e7d..9783b42 100644
--- a/gnokii/Makefile
+++ b/gnokii/Makefile
@@ -22,11 +22,15 @@ endif
 
 all: gnokii
 
-gnokii: $(OBJS) $(TOPDIR)/common/COMMON.o $(TOPDIR)/common/gsm-filetypes.o
-	$(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LOADLIBES) $(LDLIBS) -o $@
+gnokii: $(OBJS) $(TOPDIR)/common/data.a $(TOPDIR)/common/common.a cleanup.o # $(TOPDIR)/common/gsm-filetypes.o
+	$(CC) $(LDFLAGS) $(TARGET_ARCH) $^ -o $@
+#-L../common -lcommon ##$(LOADLIBES) $(LDLIBS)
 
-$(TOPDIR)/common/COMMON.o: 
-	$(MAKE) -C $(TOPDIR)/common COMMON.o
+$(TOPDIR)/common/common.a: 
+	$(MAKE) -C $(TOPDIR)/common common.a
+
+$(TOPDIR)/common/data.a:
+	$(MAKE) -C $(TOPDIR)/common data.a
 
 $(TOPDIR)/common/gsm-filetypes.o: 
 	$(MAKE) -C $(TOPDIR)/common gsm-filetypes.o
@@ -43,7 +47,7 @@ gnokiilib: $(OBJS) $(TOPDIR)/common/libmygnokii.so
 makelib: gnokiilib
 
 clean:
-	$(RM) $(OBJS) *~ depend gnokii gnokiilib *.exe core *.bak
+	$(RM) $(OBJS) cleanup.o *~ depend gnokii gnokiilib *.exe core *.bak
 
 install: all
 	$(INSTALL) -d $(bindir)