X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=Makefile;h=65bb61e8f480517410224bc81cabfcfac9c75e43;hp=443a560d6b800f157304ab9d371b39fdf8a6f01f;hb=d202661efcc1554a6d41a181185e34b7779b58d3;hpb=365d6f5b08e849d8a7be579eae5663bc852935d7

diff --git a/Makefile b/Makefile
index 443a560..65bb61e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,25 @@
 CC = gcc
 CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
-CPPFLAGS = `pkg-config --cflags dbus-glib-1`
-LDFLAGS = `pkg-config --libs dbus-glib-1`
+CPPFLAGS = `pkg-config --cflags dbus-glib-1` $(EXTRA_CPPFLAGS)
+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
+obj = main.o launcher.o dbus-server-bindings.o configfile.o log.o
+
+all:
+	@echo 'Usage:'
+	@echo '    make diablo -- build for Diablo'
+	@echo '    make fremantle -- build for Fremantle'
+diablo: $(APP)
+fremantle:
+	@$(MAKE) \
+	    EXTRA_CPPFLAGS='-DFREMANTLE `pkg-config --cflags dbus-1` $(EXTRA_CPPFLAGS)' \
+	    EXTRA_LDFLAGS='`pkg-config --libs dbus-1` $(EXTRA_LDFLAGS)' $(APP)
 
-all: $(APP)
 
 $(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" \
@@ -19,14 +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
-	install -c -m 0755 browser-switchboard $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(PREFIX)/share/applications/hildon
+	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
+.PHONY: strip install diablo fremantle