X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2FMakefile;h=8bc3749202a9756b8d635a8d19125fee15c4de54;hp=d41444f240f5d26f9be01b126923a6027a6a7ffe;hb=81d2b2485ca2a490af7f4bb5d4e2995c35c12915;hpb=3fda8f516f04eb9c0a0f7622da4ed985c1a6a632

diff --git a/config-ui/Makefile b/config-ui/Makefile
index d41444f..8bc3749 100644
--- a/config-ui/Makefile
+++ b/config-ui/Makefile
@@ -5,7 +5,7 @@ CPPFLAGS = -I../ `pkg-config --cflags gtk+-2.0` $(EXTRA_CPPFLAGS)
 CPPFLAGS_HILDON = -DHILDON `pkg-config --cflags hildon-1`
 CPPFLAGS_PLUGIN = $(CPPFLAGS_HILDON) -DHILDON_CP_APPLET \
 	`pkg-config --cflags libosso` `pkg-config --cflags hildon-control-panel`
-LDFLAGS = `pkg-config --libs gtk+-2.0` $(EXTRA_LDFLAGS)
+LDFLAGS = -Wl,--as-needed `pkg-config --libs gtk+-2.0` $(EXTRA_LDFLAGS)
 LDFLAGS_HILDON = `pkg-config --libs hildon-1`
 LDFLAGS_PLUGIN = -shared $(LDFLAGS_HILDON) \
 	`pkg-config --libs libosso` `pkg-config --libs hildon-control-panel`
@@ -36,21 +36,22 @@ fremantle-plugin:
 	@$(MAKE) EXTRA_CPPFLAGS='-DFREMANTLE $(EXTRA_CPPFLAGS)' $(PLUGIN)
 
 $(APP): $(app_obj)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(APP) $(app_obj)
+	$(CC) $(CFLAGS) -o $(APP) $(app_obj) $(LDFLAGS)
 
 %.app.o: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 $(HILDON_APP): $(happ_obj)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_HILDON) \
-		-o $(HILDON_APP) $(happ_obj)
+	$(CC) $(CFLAGS) -o $(HILDON_APP) $(happ_obj) \
+		$(LDFLAGS) $(LDFLAGS_HILDON)
 
 %.happ.o: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_HILDON) -c -o $@ $<
 
 $(PLUGIN): $(plugin_obj)
-	$(CC) $(CFLAGS) $(CFLAGS_PLUGIN) $(LDFLAGS) $(LDFLAGS_PLUGIN) \
-		-o $(PLUGIN) $(plugin_obj)
+	$(CC) $(CFLAGS) $(CFLAGS_PLUGIN) -o $(PLUGIN) $(plugin_obj) \
+		$(LDFLAGS) $(LDFLAGS_PLUGIN)
+		
 
 %.plugin.o: %.c
 	$(CC) $(CFLAGS) $(CFLAGS_PLUGIN) $(CPPFLAGS) $(CPPFLAGS_PLUGIN) \