This commit was manufactured by cvs2svn to create tag

[gnokii.git] / gnokii / Makefile

diff --git a/gnokii/Makefile b/gnokii/Makefile
index 82e5ab3..2018e7d 100644 (file)
--- a/gnokii/Makefile
+++ b/gnokii/Makefile
@@ -6,7 +6,6 @@
 TOPDIR=..
 include $(TOPDIR)/Makefile.global
 
-STACKSIZE = 150000
 
 CFLAGS += $(PTHREAD_CFLAGS)
 LDLIBS += $(PTHREAD_LIBS)
@@ -23,23 +22,11 @@ endif
 
 all: gnokii
 
-gnokii: $(OBJS) $(TOPDIR)/common/data.a $(TOPDIR)/common/common.a cleanup.o # $(TOPDIR)/common/gsm-filetypes.o
-       $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ -o $@
-ifneq "" "$(findstring -DUCCOMPAT,$(CPPFLAGS))"
-       /opt/uClinux/m68k-pic-coff/bin/coff2flt -o gnokii -s $(STACKSIZE) gnokii.coff
-endif
-
-hello: hello.o cleanup.o
-       $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ -o $@
-
-cleanup.o: cleanup.c
-       $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
-
-$(TOPDIR)/common/common.a: 
-       $(MAKE) -C $(TOPDIR)/common common.a
+gnokii: $(OBJS) $(TOPDIR)/common/COMMON.o $(TOPDIR)/common/gsm-filetypes.o
+       $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
-$(TOPDIR)/common/data.a:
-       $(MAKE) -C $(TOPDIR)/common data.a
+$(TOPDIR)/common/COMMON.o: 
+       $(MAKE) -C $(TOPDIR)/common COMMON.o
 
 $(TOPDIR)/common/gsm-filetypes.o: 
        $(MAKE) -C $(TOPDIR)/common gsm-filetypes.o
@@ -56,7 +43,7 @@ gnokiilib: $(OBJS) $(TOPDIR)/common/libmygnokii.so
 makelib: gnokiilib
 
 clean:
-       $(RM) $(OBJS) cleanup.o hello.o *~ depend gnokii gnokiilib *.exe core *.bak
+       $(RM) $(OBJS) *~ depend gnokii gnokiilib *.exe core *.bak
 
 install: all
        $(INSTALL) -d $(bindir)