From 39b41416a9b2699f1aae3a7a1a638ebe9708315d Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Wed, 3 Jan 2007 19:33:54 +0000
Subject: Use incremental linking for libtnt-live

---
 Makefile       | 8 ++++----
 css/Makefile   | 6 +++---
 pages/Makefile | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index dc18d9c..84a5680 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.14 2007/01/03 18:33:33 tadi Exp $
+# $Id: Makefile,v 1.15 2007/01/03 19:33:54 tadi Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -58,8 +58,8 @@ SUBDIRS   = httpd pages css
 PLUGINOBJS = $(PLUGIN).o thread.o tntconfig.o setup.o i18n.o
 
 WEBOBJS = tools.o
-WEBLIBS = pages/libpages.a \
-	  css/libcss.a
+WEBLIBS = pages/libpages.o \
+	  css/libcss.o
 
 ### Default rules:
 
@@ -85,7 +85,7 @@ $(DEPFILE): Makefile
 
 SUBDIRS:
 	@for dir in $(SUBDIRS); do \
-		make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
+		make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" ; \
 	done
 
 libvdr-$(PLUGIN).so: $(PLUGINOBJS) $(LIBS)
diff --git a/css/Makefile b/css/Makefile
index 006548e..8fb86a2 100644
--- a/css/Makefile
+++ b/css/Makefile
@@ -30,10 +30,10 @@ OBJS	= styles.o
 
 ### Targets:
 
-all: libcss.a
+all: libcss.o
 
-libcss.a: $(OBJS)
-	$(AR) r $@ $^
+libcss.o: $(OBJS)
+	$(LD) -i -o $@ $^
 
 clean:
 	@rm -f *~ *.o core* libcss.a $(OBJS:%.o=%.cpp)
diff --git a/pages/Makefile b/pages/Makefile
index 74aa642..b37c527 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -42,10 +42,10 @@ OBJS	= menu.o channels.o schedule.o whats_on_now.o
 
 ### Targets:
 
-all: libpages.a
+all: libpages.o
 
-libpages.a: $(OBJS)
-	$(AR) r $@ $^
+libpages.o: $(OBJS)
+	$(LD) -i -o $@ $^
 
 clean:
 	@rm -f *~ *.o core* libpages.a $(OBJS:%.o=%.cpp)
-- 
cgit v1.2.3