X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=b9c8c6f4b20e8e34a51d0aae064a9eb8a0008b74;hb=refs%2Fheads%2Fmaster;hp=21edf3e6fbe90c62fdb278b2009d69f92092d398;hpb=c727d0966b4d0d47f3ed4cd3ba2d68c10451f42a;p=simple-launcher

diff --git a/Makefile b/Makefile
index 21edf3e..b9c8c6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
 GTKCFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
 GTKLIBS := $(shell pkg-config gtk+-2.0 --libs)
 
+GCONFCFLAGS := $(shell pkg-config gconf-2.0 --cflags)
+GCONFLIBS := $(shell pkg-config gconf-2.0 --libs)
+
 DBUSCFLAGS := $(shell pkg-config dbus-1 --cflags)
 DBUSLIBS := $(shell pkg-config dbus-1 --libs)
 
-CXXFLAGS=-Wall -g -MMD $(GTKCFLAGS) $(DBUSCFLAGS)
+CXXFLAGS=-Wall -g -MMD $(GTKCFLAGS) $(DBUSCFLAGS) $(GCONFCFLAGS)
 #LDFLAGS = -module -avoid-version
 LDFLAGS = -shared
 LIBS = -lstdc++
@@ -15,19 +18,11 @@ BACKUP_CONF=simple-launcher.backup
 
 all: $(TARGET)
 
-tests: test test1
-
-$(TARGET): simple-launcher.o launchable-item.o launcher-item.o sla-list.o utils.o settings-dialog.o
+$(TARGET): simple-launcher.o launchable-item.o launcher-item.o settings-page-items.o utils.o settings-dialog.o gconf-wrapper.o dialog-entry.o settings-page-entries.o
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
-test: test.o launcher-item.o
-	g++ -o $@ $^ $(GTKLIBS) $(DBUSLIBS) $(LIBS) -losso
-
-test1: test1.o sla-list.o launcher-item.o
-	g++ -g -o $@ $^ $(GTKLIBS) $(DBUSLIBS) $(LIBS)
-
 clean:
-	rm -f *.d *.o $(TARGET) test test1
+	rm -f *.d *.o $(TARGET)
 
 install: $(TARGET)
 	install -d $(DESTDIR)/usr/share/applications/hildon-home
@@ -37,4 +32,10 @@ install: $(TARGET)
 	install -d $(DESTDIR)/etc/osso-backup/applications
 	install -m 0644 $(BACKUP_CONF) $(DESTDIR)/etc/osso-backup/applications/simple-launcher.conf
 
+pclean:
+	fakeroot debian/rules clean
+
+package:
+	dpkg-buildpackage -rfakeroot -uc -b
+
 -include *.d