X-Git-Url: http://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=xgnokii%2FMakefile;h=50afb7cd4bf75451b5156604fb37b095baef2485;hp=92f7ceaa0645e4b38badc352c2645143b2ec4c7b;hb=49dd905279a8e62936e3713510ab0fd738e20ecb;hpb=4ee1266711b695852ec88f06784fd84400cd70bb

diff --git a/xgnokii/Makefile b/xgnokii/Makefile
index 92f7cea..50afb7c 100644
--- 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) -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