X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2FMakefile;h=8bc3749202a9756b8d635a8d19125fee15c4de54;hp=f26c1584421cbfb2be869317d19ed6b59fad08ea;hb=d6e7a8bf0f28cdb7156b891ff565d5406047914a;hpb=2a7ce533a642bc8ada7e36eca0887092c505916b

diff --git a/config-ui/Makefile b/config-ui/Makefile
index f26c158..8bc3749 100644
--- a/config-ui/Makefile
+++ b/config-ui/Makefile
@@ -1,58 +1,74 @@
 CC = gcc
-CFLAGS = -Wall -Os -mcpu=arm1136jf-s -mthumb
+CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
 CFLAGS_PLUGIN = -fPIC
-CPPFLAGS = `pkg-config --cflags gtk+-2.0`
+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 dbus-1` `pkg-config --cflags hildon-control-panel`
-LDFLAGS = `pkg-config --libs gtk+-2.0`
+	`pkg-config --cflags libosso` `pkg-config --cflags hildon-control-panel`
+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 dbus-1` `pkg-config --libs hildon-control-panel`
-PREFIX = /usr/local
+	`pkg-config --libs libosso` `pkg-config --libs hildon-control-panel`
+PREFIX = /usr
+
+other_obj = ../configfile.o
 
 APP = browser-switchboard-cp
-app_obj = $(APP).app.o
+app_obj = $(APP).app.o $(other_obj)
 HILDON_APP = $(APP)-hildon
-happ_obj = $(APP).happ.o
+happ_obj = $(APP).happ.o $(other_obj)
 PLUGIN = lib$(APP).so
-plugin_obj = $(APP).plugin.o
+plugin_obj = $(APP).plugin.o ../configfile.plugin.o
 
-all: plugin
-plugin: $(PLUGIN)
+all:
+	@echo 'Usage:'
+	@echo '    make app -- build standalone GTK+ application'
+	@echo '    make diablo-hildon-app -- build standalone Diablo Hildon application'
+	@echo '    make diablo-plugin -- build Diablo hildon-control-panel plugin'
+	@echo '    make fremantle-hildon-app -- build standalone Fremantle Hildon application'
+	@echo '    make fremantle-plugin -- build Fremantle hildon-control-panel plugin'
 app: $(APP)
-hildon-app: $(HILDON_APP)
+diablo-hildon-app: $(HILDON_APP)
+diablo-plugin: $(PLUGIN)
+fremantle-hildon-app:
+	@$(MAKE) EXTRA_CPPFLAGS='-DFREMANTLE $(EXTRA_CPPFLAGS)' $(HILDON_APP)
+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) \
 		-c -o $@ $<
 
-strip: $(PLUGIN)
+strip: strip-plugin
+strip-plugin: $(PLUGIN)
 	strip $(PLUGIN)
 
-install: all
-	mkdir -p $(DESTDIR)$(PREFIX)/share/hildon-control-panel
+install: install-plugin
+install-plugin: $(PLUGIN)
+	mkdir -p $(DESTDIR)$(PREFIX)/lib/hildon-control-panel
+	mkdir -p $(DESTDIR)$(PREFIX)/share/applications/hildon-control-panel
 	install -c -m 0755 $(PLUGIN) $(DESTDIR)$(PREFIX)/lib/hildon-control-panel
 	install -c -m 0644 $(APP).desktop $(DESTDIR)$(PREFIX)/share/applications/hildon-control-panel
 
 clean:
-	rm -f $(APP) $(HILDON_APP) $(PLUGIN) *.o
+	rm -f $(APP) $(HILDON_APP) $(PLUGIN) $(app_obj) $(happ_obj) $(plugin_obj)
 
-.PHONY: strip install plugin app hildon-app
+.PHONY: strip strip-plugin install install-plugin app diablo-hildon-app diablo-plugin fremantle-hildon-app fremantle-plugin