git-svn-id: file:///svnroot/speedometer/trunk@38 df364472-da61-43ef-8a67-511c89aa921b

[speedometer] / Makefile

diff --git a/Makefile b/Makefile
index c8c82dc..5d7214d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,22 @@
+PKGS     = gtk+-2.0 liblocation gconf-2.0
 CC       = gcc
 LINK     = gcc
-CFLAGS   = -g -Wall -O0
-INCPATH  = `pkg-config --cflags gtk+-2.0 liblocation`
-LIBS     = `pkg-config --libs gtk+-2.0 liblocation`
+CFLAGS   = -g -Wall -pedantic -std=gnu99
+INCPATH  = `pkg-config --cflags $(PKGS)`
+LIBS     = `pkg-config --libs $(PKGS)`
 
-SOURCES  = main.c callbacks.c
-OBJECTS  = main.o callbacks.o
+SOURCES  = main.c callbacks.c ui.c util.c
+OBJECTS  = main.o callbacks.o ui.o util.o
 TARGET   = speedometer
 
 
-
-
-
-
-
-
-
 all: $(TARGET)
 
 $(TARGET):  $(OBJECTS)
-       $(LINK) -o $(TARGET) $(OBJECTS) $(LIBS)
+       $(LINK) $(LIBS) $(OBJECTS) -o $(TARGET) 
 
 $(OBJECTS): $(SOURCES)
-       $(CC) -c $(SOURCES) $(INCPATH)
-
+       $(CC) $(INCPATH) $(CFLAGS) -c $(SOURCES) 
 
 clean:
        rm -f $(OBJECTS) $(TARGET)
@@ -32,5 +25,7 @@ install: all
        install -D -m 755 speedometer $(DESTDIR)/usr/bin/speedometer
        install -D data/speedometer.desktop $(DESTDIR)/usr/share/applications/hildon/speedometer.desktop
        install -D data/speedometer.service $(DESTDIR)/usr/share/dbus-1/services/speedometer.service
+       install -d $(DESTDIR)/usr/share/speedometer/
+       install data/*.png $(DESTDIR)/usr/share/speedometer/