X-Git-Url: https://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=common%2FMakefile;h=e396803b2574f1c7d70e88bcb65bbe0ae412f5fa;hp=9b44ad14035b9d79909140b768fbda938ca3a2cd;hb=a2dfc99dc499ea8600bf5178f8122125d7d7d557;hpb=4ee1266711b695852ec88f06784fd84400cd70bb

diff --git a/common/Makefile b/common/Makefile
index 9b44ad1..e396803 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -1,12 +1,7 @@
 
 #
-# $Id$
-#
 # Makefile for the GNOKII tool suite.
 #
-# Copyright (C) 1999 Hugh Blemings & Pavel Janík ml.
-#               2000 Karel Zak
-#
 
 #
 # For this common directory is used "subsystem.o" .o files concept.
@@ -17,46 +12,73 @@
 TOPDIR=..
 include $(TOPDIR)/Makefile.global
 
-OBJS =	cfgreader.o \
-	device.o \
+CFLAGS += $(PTHREAD_CFLAGS)
+
+DIRS =		protocol \
+		oldmodules \
+		newmodules
+
+OBJS =	devices/device.o \
+	data/rlp-common.o \
+	data/rlp-crc24.o \
+	files/midifile.o \
 	gsm-ringtones.o \
+	gsm-coding.o \
+	gsm-datetime.o \
+	gsm-wap.o \
 	gsm-api.o \
+	gsm-phonebook.o \
+	gsm-calendar.o \
 	gsm-networks.o \
-	vcal.o \
-	misc.o \
-        gsm-sms.o \
 	gsm-bitmaps.o \
-	gsm-common.o \
-	gsm-encoding.o \
-	gsm-error.o \
-	gsm-statemachine.o
-
-all: libgnokii.so gsm-filetypes.o
+	gsm-sms.o \
+	files/cfgreader.o \
+	misc.o \
+	protocol/fbus.o \
+	protocol/fbusirda.o \
+	protocol/mbus.o \
+	protocol/at.o \
+	newmodules/sniff/sniff.o \
+	newmodules/newat.o \
+	newmodules/n6110.o \
+	newmodules/n7110.o
+
+DATA_OBJS = data/virtmodem.o \
+	data/at-emulator.o \
+	data/datapump.o
+
+ifdef WIN32
+	OBJS += $(TOPDIR)/win32/winserial.o
+else
+	OBJS += devices/unixserial.o \
+	        devices/unixirda.o \
+		devices/tekram.o
+endif
 
-phones/PHONES.o:
-	$(MAKE) -C phones PHONES.o
+ifdef XPM_CFLAGS
+    CFLAGS += $(XPM_CFLAGS)
+endif
 
-links/LINKS.o:
-	$(MAKE) -C links LINKS.o
+all: COMMON.o DATA.o gsm-filetypes.o
 
-devices/DEVICES.o:
-	$(MAKE) -C devices DEVICES.o
+COMMON.o: $(OBJS)
+	$(LD) $(LDREL) $(LDOUT) COMMON.o $(OBJS)
 
-libgnokii.so: $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o
-	$(CC) -shared -o libgnokii.so $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o
+DATA.o: $(DATA_OBJS)
+	$(LD) $(LDREL) $(LDOUT) DATA.o $(DATA_OBJS)
 
-gsm-filetypes.o: gsm-filetypes.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(XPM_CFLAGS) -c gsm-filetypes.c
+gsm-filetypes.o: files/gsm-filetypes.c 
+	$(CC) $(CFLAGS) -c files/gsm-filetypes.c
 
-vcal.c: vcal.lx
-	$(LEX) -ovcal.c vcal.lx
+makelib: $(OBJS) DATA.o gsm-filetypes.o
+	$(CC) -shared -o libmygnokii.so $(OBJS) DATA.o gsm-filetypes.o
 
 clean:
-	$(RM) $(OBJS) *~ depend libgnokii.so gsm-filetypes.o vcal.c phones/PHONES.o links/LINKS.o devices/DEVICES.o
-
+	$(RM) $(OBJS) $(DATA_OBJS) *~ depend libmygnokii.so COMMON.o gsm-filetypes.o DATA.o
+	
 install:
 	$(INSTALL) -d $(libdir)
-	$(INSTALL) libgnokii.so $(libdir)
+	$(INSTALL) libmygnokii.so $(libdir)
 	@echo
 
 depend dep:
@@ -68,4 +90,3 @@ endif
 
 
 .PHONY: all install clean dep depend
-