X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=ca7b6e087a3a572540f6bd8cfe9dc96d63e528c7;hb=3f43bcf738a5c84a2e8594deb477300fbec3007d;hp=9e28432827610a9ca011a7e35284f63428e37ba5;hpb=da1232179564424dfa09852cb52471c600a49967;p=simple-launcher

diff --git a/Makefile b/Makefile
index 9e28432..ca7b6e0 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++
@@ -13,9 +16,9 @@ TARGET=simple-launcher.so
 DESKTOP_FILE=simple-launcher.desktop
 BACKUP_CONF=simple-launcher.backup
 
-all: $(TARGET)
+all: test2 $(TARGET)
 
-tests: test test1
+tests: test test1 test2
 
 $(TARGET): simple-launcher.o launchable-item.o launcher-item.o sla-list.o utils.o settings-dialog.o gconf-wrapper.o
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -26,8 +29,11 @@ test: test.o launcher-item.o
 test1: test1.o sla-list.o launcher-item.o
 	g++ -g -o $@ $^ $(GTKLIBS) $(DBUSLIBS) $(LIBS)
 
+test2: test2.o gconf-wrapper.o
+	g++ -g -o $@ $^ $(GCONFLIBS)
+
 clean:
-	rm -f *.d *.o $(TARGET) test test1
+	rm -f *.d *.o $(TARGET) test test1 test2
 
 install: $(TARGET)
 	install -d $(DESTDIR)/usr/share/applications/hildon-home