First version, development moved to 5110-connected machine

[gnokii.git] / gnokii / Makefile

diff --git a/gnokii/Makefile b/gnokii/Makefile
index 2018e7d..9783b42 100644 (file)
--- 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)