X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2FMakefile;h=bb7ad9862da58eb2efe732b583cc456547a634b7;hp=b6a7d1745a16942d43dc11c81f4694326f79676e;hb=addb0ed9acf6b77080894bbc1e85481f40de47f3;hpb=ec8b58af1b1cf22f34478faf476047e7ce996245;ds=sidebyside

diff --git a/config-ui/Makefile b/config-ui/Makefile
index b6a7d17..bb7ad98 100644
--- a/config-ui/Makefile
+++ b/config-ui/Makefile
@@ -14,7 +14,9 @@ PREFIX = /usr
 other_obj = ../configfile.o ../config.o save-config.o
 
 APP = browser-switchboard-cp
+UTIL = browser-switchboard-config
 app_obj = $(APP).app.o $(other_obj)
+util_obj = $(UTIL).o $(other_obj)
 HILDON_APP = $(APP)-hildon
 happ_obj = $(APP).happ.o $(other_obj)
 PLUGIN = lib$(APP).so
@@ -23,11 +25,13 @@ plugin_obj = $(APP).plugin.o ../configfile.plugin.o ../config.plugin.o save-conf
 all:
 	@echo 'Usage:'
 	@echo '    make app -- build standalone GTK+ application'
+	@echo '    make util -- build command-line configuration utility'
 	@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)
+util: $(UTIL)
 diablo-hildon-app: $(HILDON_APP)
 diablo-plugin: $(PLUGIN)
 fremantle-hildon-app:
@@ -41,6 +45,9 @@ $(APP): $(app_obj)
 %.app.o: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
+$(UTIL): $(util_obj)
+	$(CC) $(CFLAGS) -o $(UTIL) $(util_obj) $(LDFLAGS)
+
 $(HILDON_APP): $(happ_obj)
 	$(CC) $(CFLAGS) -o $(HILDON_APP) $(happ_obj) \
 		$(LDFLAGS) $(LDFLAGS_HILDON)
@@ -57,18 +64,23 @@ $(PLUGIN): $(plugin_obj)
 	$(CC) $(CFLAGS) $(CFLAGS_PLUGIN) $(CPPFLAGS) $(CPPFLAGS_PLUGIN) \
 		-c -o $@ $<
 
-strip: strip-plugin
+strip: strip-plugin strip-util
 strip-plugin: $(PLUGIN)
 	strip $(PLUGIN)
+strip-util: $(UTIL)
+	strip ($UTIL)
 
-install: install-plugin
+install: install-plugin install-util
 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
+install-util: $(UTIL)
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	install -c -m 0755 $(UTIL) $(DESTDIR)$(PREFIX)/bin
 
 clean:
-	rm -f $(APP) $(HILDON_APP) $(PLUGIN) $(app_obj) $(happ_obj) $(plugin_obj)
+	rm -f $(APP) $(UTIL) $(HILDON_APP) $(PLUGIN) $(app_obj) $(util_obj) $(happ_obj) $(plugin_obj)
 
-.PHONY: strip strip-plugin install install-plugin app diablo-hildon-app diablo-plugin fremantle-hildon-app fremantle-plugin
+.PHONY: strip strip-plugin strip-util install install-plugin install-util app util diablo-hildon-app diablo-plugin fremantle-hildon-app fremantle-plugin