Update debian/changelog, bump version number

[browser-switch] / Makefile

diff --git a/Makefile b/Makefile
index d608e3c..4e140ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 CC = gcc
 CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
 CPPFLAGS = `pkg-config --cflags dbus-glib-1` $(EXTRA_CPPFLAGS)
-LDFLAGS = `pkg-config --libs dbus-glib-1` $(EXTRA_LDFLAGS)
+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 log.o
+obj = main.o launcher.o dbus-server-bindings.o config.o configfile.o log.o
 
 all:
        @echo 'Usage:'
@@ -19,7 +19,7 @@ fremantle:
 
 
 $(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" \
@@ -28,17 +28,21 @@ 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
        mkdir -p $(DESTDIR)$(PREFIX)/share/applications/hildon
-       install -c -m 0755 browser-switchboard $(DESTDIR)$(PREFIX)/bin
+       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
 
+install-xsession-script:
+       mkdir -p $(DESTDIR)/etc/X11/Xsession.post
+       install -c -m 0755 xsession-post.sh $(DESTDIR)/etc/X11/Xsession.post/35browser-switchboard
+
 clean:
-       rm -f $(APP) *.o dbus-server-glue.h
+       rm -f $(APP) $(obj) dbus-server-glue.h
 
-.PHONY: strip install diablo fremantle
+.PHONY: strip install install-xsession-script diablo fremantle