X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=Makefile;h=e6e1bb800cffe4a466c0ffc6aa90c51ac222909f;hp=d608e3c43a517b5cebeafcc2ddf3beffbe6fee11;hb=16ad4992d0c5b982f660e8a533f7c37c77c2fdbe;hpb=cf66e0a413468f9da4aaf05d61ec785bd7287ba2

diff --git a/Makefile b/Makefile
index d608e3c..e6e1bb8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 CC = gcc
 CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
 CPPFLAGS = `pkg-config --cflags dbus-glib-1` $(EXTRA_CPPFLAGS)
-LDFLAGS = `pkg-config --libs dbus-glib-1` $(EXTRA_LDFLAGS)
+LDFLAGS = -Wl,--as-needed `pkg-config --libs dbus-glib-1` $(EXTRA_LDFLAGS)
 PREFIX = /usr
 
 APP = browser-switchboard
-obj = main.o launcher.o dbus-server-bindings.o configfile.o log.o
+obj = main.o launcher.o dbus-server-bindings.o config.o configfile.o log.o
 
 all:
 	@echo 'Usage:'
@@ -19,7 +19,7 @@ fremantle:
 
 
 $(APP): dbus-server-glue.h $(obj)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(APP) $(obj)
+	$(CC) $(CFLAGS) -o $(APP) $(obj) $(LDFLAGS)
 
 dbus-server-glue.h:
 	dbus-binding-tool --mode=glib-server --prefix="osso_browser" \
@@ -28,17 +28,17 @@ dbus-server-glue.h:
 strip: $(APP)
 	strip $(APP)
 
-install: all
+install: $(APP)
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	mkdir -p $(DESTDIR)$(PREFIX)/share/dbus-1/services
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications/hildon
-	install -c -m 0755 browser-switchboard $(DESTDIR)$(PREFIX)/bin
+	install -c -m 0755 $(APP) $(DESTDIR)$(PREFIX)/bin
 	install -c -m 0644 com.nokia.osso_browser.service $(DESTDIR)$(PREFIX)/share/dbus-1/services
 	install -c -m 0755 browser $(DESTDIR)$(PREFIX)/bin
 	install -c -m 0755 microb $(DESTDIR)$(PREFIX)/bin
 	install -c -m 0644 microb.desktop $(DESTDIR)$(PREFIX)/share/applications/hildon
 
 clean:
-	rm -f $(APP) *.o dbus-server-glue.h
+	rm -f $(APP) $(obj) dbus-server-glue.h
 
 .PHONY: strip install diablo fremantle