X-Git-Url: https://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=common%2FMakefile;h=2dad72903a26a0ca818d9c46bd88a41e8809215f;hp=f09a1e8c94f2940bb86671426cec68d5171c15fb;hb=0484268a27be1ab830d087847d830bc0ec734016;hpb=975a83d253eea8aa37bf3dfd7e026df3027db4ff

diff --git a/common/Makefile b/common/Makefile
index f09a1e8..2dad729 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -18,31 +18,32 @@ DIRS =		protocol \
 		oldmodules \
 		newmodules
 
-#	files/midifile.o \
-#	gsm-wap.o \
-#	gsm-calendar.o \
-#	protocol/fbusirda.o \
-#	protocol/mbus.o \
-#	protocol/at.o \
-#	newmodules/n7110.o
-#	newmodules/sniff/sniff.o \
-#	newmodules/newat.o \
-#	gsm-phonebook.o \
-#	gsm-bitmaps.o \
-#	gsm-networks.o \
-#	gsm-coding.o \
-#	gsm-sms.o \
-#	gsm-ringtones.o \
-
 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 \
+	gsm-bitmaps.o \
+	gsm-sms.o \
 	files/cfgreader.o \
 	misc.o \
 	protocol/fbus.o \
-	newmodules/n6110.o
+	protocol/fbus3110.o \
+	protocol/fbusirda.o \
+	protocol/mbus.o \
+	protocol/at.o \
+	newmodules/sniff/sniff.o \
+	newmodules/newat.o \
+	newmodules/n6110.o \
+	newmodules/n3110.o \
+	newmodules/n7110.o
 
 DATA_OBJS = data/virtmodem.o \
 	data/at-emulator.o \
@@ -51,22 +52,22 @@ DATA_OBJS = data/virtmodem.o \
 ifdef WIN32
 	OBJS += $(TOPDIR)/win32/winserial.o
 else
-	OBJS += devices/unixserial.o
-#	        devices/unixirda.o \
-#		devices/tekram.o
+	OBJS += devices/unixserial.o \
+	        devices/unixirda.o \
+		devices/tekram.o
 endif
 
 ifdef XPM_CFLAGS
     CFLAGS += $(XPM_CFLAGS)
 endif
 
-all: common.a data.a ##gsm-filetypes.o
+all: COMMON.o DATA.o gsm-filetypes.o
 
-common.a: $(OBJS)
-	$(AR) rcs $@ $^
+COMMON.o: $(OBJS)
+	$(LD) $(LDREL) $(LDOUT) COMMON.o $(OBJS)
 
-data.a: $(DATA_OBJS)
-	$(AR) rcs $@ $^
+DATA.o: $(DATA_OBJS)
+	$(LD) $(LDREL) $(LDOUT) DATA.o $(DATA_OBJS)
 
 gsm-filetypes.o: files/gsm-filetypes.c 
 	$(CC) $(CFLAGS) -c files/gsm-filetypes.c