Found in "gnokii-working" directory, some November-patches version

[gnokii.git] / xgnokii / Makefile

diff --git a/xgnokii/Makefile b/xgnokii/Makefile
index c7d1e88..50afb7c 100644 (file)
--- a/xgnokii/Makefile
+++ b/xgnokii/Makefile
@@ -14,6 +14,7 @@ include $(TOPDIR)/Makefile.global
 
 ifdef XPM_LIBS
     LDFLAGS += $(XPM_LIBS)
+    LDLIBS  += $(XPM_LIBS)
     CFLAGS  += $(XPM_CFLAGS)
 endif
 
@@ -22,8 +23,8 @@ CFLAGS += $(PTHREAD_CFLAGS) \
 
 LDFLAGS += $(PTHREAD_LIBS) \
           $(GTK_LIBS)
-
-LDFLAGS += -L$(TOPDIR)/common -lgnokii
+LDLIBS  += $(PTHREAD_LIBS) \
+          $(GTK_LIBS)
 
 OBJS =         xgnokii.o \
        xgnokii_common.o \
@@ -45,10 +46,13 @@ HELP_DIR = docs/help
 all: xgnokii
 
 
-xgnokii: $(OBJS) $(TOPDIR)/common/data/DATA.o $(TOPDIR)/common/gsm-filetypes.o
+xgnokii: $(OBJS) $(TOPDIR)/common/gsm-filetypes.o $(TOPDIR)/common/libgnokii.a #$(TOPDIR)/common/data/DATA.o
+
+$(TOPDIR)/common/COMMON.o:
+       $(MAKE) -C $(TOPDIR)/common libgnokii.a
 
-$(TOPDIR)/common/data/DATA.o:
-       $(MAKE) -C $(TOPDIR)/common/data DATA.o
+#$(TOPDIR)/common/data/DATA.o:
+#      $(MAKE) -C $(TOPDIR)/common/data DATA.o
 
 $(TOPDIR)/common/gsm-filetypes.o:
        $(MAKE) -C $(TOPDIR)/common gsm-filetypes.o