X-Git-Url: https://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=gnokii%2FMakefile;h=4719cc8684888fff1cb6682bf338ce215d61f88e;hp=2018e7d3befb5eb1870674170d7885acd8b87559;hb=49dd905279a8e62936e3713510ab0fd738e20ecb;hpb=2f2703c9133032c12671ca5c77ae626b8fb178d4;ds=sidebyside

diff --git a/gnokii/Makefile b/gnokii/Makefile
index 2018e7d..4719cc8 100644
--- a/gnokii/Makefile
+++ b/gnokii/Makefile
@@ -2,16 +2,20 @@
 #
 # Makefile for the GNOKII tool suite.
 #
+# Copyright (C) 1999 Hugh Blemings & Pavel Janík ml.
+#               2000 Karel Zak
+#
 
 TOPDIR=..
 include $(TOPDIR)/Makefile.global
 
 
 CFLAGS	+= $(PTHREAD_CFLAGS)
-LDLIBS	+= $(PTHREAD_LIBS)
+LDFLAGS += $(PTHREAD_LIBS)
 
 ifdef XPM_LIBS
-    LDLIBS += $(XPM_LIBS)
+    LDFLAGS +=$(XPM_LIBS)
+    LDLIBS  +=$(XPM_LIBS)
 endif
 
 OBJS =	gnokii.o
@@ -22,38 +26,27 @@ 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/libgnokii.a $(TOPDIR)/common/gsm-filetypes.o
 
-$(TOPDIR)/common/COMMON.o: 
-	$(MAKE) -C $(TOPDIR)/common COMMON.o
+$(TOPDIR)/common/COMMON.o:
+	$(MAKE) -C $(TOPDIR)/common libgnokii.a
 
-$(TOPDIR)/common/gsm-filetypes.o: 
+$(TOPDIR)/common/gsm-filetypes.o:
 	$(MAKE) -C $(TOPDIR)/common gsm-filetypes.o
 
 $(TOPDIR)/getopt/libgetopt.a:
 	$(MAKE) -C $(TOPDIR)/getopt
 
-$(TOPDIR)/common/libmygnokii.so:
-	$(MAKE) -C $(TOPDIR)/common makelib
-	
-gnokiilib: $(OBJS) $(TOPDIR)/common/libmygnokii.so
-	$(CC) $(LDFLAGS) $(TARGET_ARCH) $(OBJS) -L$(TOPDIR)/common -lmygnokii $(LOADLIBES) $(LDLIBS) -o $@
-
-makelib: gnokiilib
-
 clean:
-	$(RM) $(OBJS) *~ depend gnokii gnokiilib *.exe core *.bak
+	$(RM) $(OBJS) *~ depend gnokii *.exe core *.bak
 
 install: all
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) gnokii $(bindir)
-	$(INSTALL) gnokiilib $(bindir)/gnokii
 
 install-strip: all
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -s gnokii $(bindir)
-	$(INSTALL) -s gnokiilib $(bindir)/gnokii
 	@echo "done"
 
 install-suid: all
@@ -62,7 +55,6 @@ install-suid: all
 	fi
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -o root -g gnokii -m 0750 gnokii $(bindir)
-	$(INSTALL) -o root -g gnokii -m 0750 gnokiilib $(bindir)/gnokii
 	@echo
 
 install-ss: all
@@ -71,7 +63,6 @@ install-ss: all
 	fi
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -o root -g gnokii -m 0750 -s gnokii $(bindir)
-	$(INSTALL) -o root -g gnokii -m 0750 -s gnokiilib $(bindir)/gnokii
 	@echo
 
 depend dep: