From: mishas <mikhail.sobolev@gmail.com>
Date: Wed, 7 Nov 2007 17:14:14 +0000 (+0000)
Subject:  * detect proper parameters for libhildondesktop & hildon-1
X-Git-Url: http://git.maemo.org/git/?p=simple-launcher;a=commitdiff_plain;h=ccb547ecb03a16e966a7580017f87af4e2a023a0

 * detect proper parameters for libhildondesktop & hildon-1
 * declare the build content separately (list of source files)


git-svn-id: file:///svnroot/simple-launcher/branches/new-items@247 3ba93dab-e023-0410-b42a-de7732cf370a
---

diff --git a/Makefile b/Makefile
index b9c8c6f..703f99b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,13 @@ 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) $(GCONFCFLAGS)
+HILDONCFLAGS := $(shell pkg-config hildon-1 --cflags)
+HILDONLIBS := $(shell pkg-config hildon-1 --libs)
+
+HDESKTOPCFLAGS := $(shell pkg-config libhildondesktop --cflags)
+HDESKTOPLIBS := $(shell pkg-config libhildondesktop --libs)
+
+CXXFLAGS=-Wall -g -MMD $(HILDONCFLAGS) $(HDESKTOPCFLAGS) $(GTKCFLAGS) $(DBUSCFLAGS) $(GCONFCFLAGS)
 #LDFLAGS = -module -avoid-version
 LDFLAGS = -shared
 LIBS = -lstdc++
@@ -16,9 +22,23 @@ TARGET=simple-launcher.so
 DESKTOP_FILE=simple-launcher.desktop
 BACKUP_CONF=simple-launcher.backup
 
+SOURCES := \
+	dialog-entry.cc \
+	gconf-wrapper.cc \
+	launchable-item.cc \
+	launcher-item.cc \
+	settings-dialog.cc \
+	settings-page-entries.cc \
+	settings-page-items.cc \
+	simple-launcher.cc \
+	utils.cc \
+#	applet-wrapper.cc
+
+OBJS := $(SOURCES:%.cc=%.o)
+
 all: $(TARGET)
 
-$(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
+$(TARGET): $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean: