Refactor configuration

[browser-switch] / config-ui / Makefile

diff --git a/config-ui/Makefile b/config-ui/Makefile
index d41444f..b6a7d17 100644 (file)
--- a/config-ui/Makefile
+++ b/config-ui/Makefile
@@ -5,20 +5,20 @@ 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`
 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`
 PREFIX = /usr
 
 LDFLAGS_HILDON = `pkg-config --libs hildon-1`
 LDFLAGS_PLUGIN = -shared $(LDFLAGS_HILDON) \
        `pkg-config --libs libosso` `pkg-config --libs hildon-control-panel`
 PREFIX = /usr
 

-other_obj = ../configfile.o
+other_obj = ../configfile.o ../config.o save-config.o

 
 APP = browser-switchboard-cp
 app_obj = $(APP).app.o $(other_obj)
 HILDON_APP = $(APP)-hildon
 happ_obj = $(APP).happ.o $(other_obj)
 PLUGIN = lib$(APP).so
 
 APP = browser-switchboard-cp
 app_obj = $(APP).app.o $(other_obj)
 HILDON_APP = $(APP)-hildon
 happ_obj = $(APP).happ.o $(other_obj)
 PLUGIN = lib$(APP).so

-plugin_obj = $(APP).plugin.o ../configfile.plugin.o
+plugin_obj = $(APP).plugin.o ../configfile.plugin.o ../config.plugin.o save-config.plugin.o

 
 all:
        @echo 'Usage:'
 
 all:
        @echo 'Usage:'

@@ -36,21 +36,22 @@ fremantle-plugin:
        @$(MAKE) EXTRA_CPPFLAGS='-DFREMANTLE $(EXTRA_CPPFLAGS)' $(PLUGIN)
 
 $(APP): $(app_obj)
        @$(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)
 
 %.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)
 
 %.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) \
 
 %.plugin.o: %.c
        $(CC) $(CFLAGS) $(CFLAGS_PLUGIN) $(CPPFLAGS) $(CPPFLAGS_PLUGIN) \