X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=Makefile;h=a5c6924c1c64e71549d3ce00d95683a1e33ac36d;hp=e6199a85f0d2915230c681641e1b8740d6219083;hb=c9ffd114eeadbf6968f4404d15d80eab9192bc6b;hpb=7d3b3e8a206bffae1e491f5887ab1aaaf69e4759

diff --git a/Makefile b/Makefile
index e6199a8..a5c6924 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,22 @@
 CC = gcc
-CFLAGS = -Wall -Os -mcpu=arm1136jf-s -mthumb
-CPPFLAGS = -Wall `pkg-config --cflags dbus-glib-1`
-LDFLAGS = `pkg-config --libs dbus-glib-1`
-PREFIX = /usr/local
+CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
+CPPFLAGS = `pkg-config --cflags dbus-glib-1` $(EXTRA_CPPFLAGS)
+LDFLAGS = `pkg-config --libs dbus-glib-1` $(EXTRA_LDFLAGS)
+PREFIX = /usr
 
 APP = browser-switchboard
-obj = main.o launcher.o dbus-server-bindings.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)
@@ -21,9 +30,15 @@ strip: $(APP)
 
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(PREFIX)/share/dbus-1/services
+	mkdir -p $(DESTDIR)$(PREFIX)/share/applications/hildon
 	install -c -m 0755 browser-switchboard $(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