From: Vlad <vlad@gas.by>
Date: Fri, 20 Aug 2010 11:37:58 +0000 (+0300)
Subject: Make
X-Git-Url: http://git.maemo.org/git/?p=shermanaquarium;a=commitdiff_plain;h=d2037e2171e7bc32e386cf96bed5226c27722fb9

Make
---

diff --git a/sherman-aquarium/shermans/Makefile b/sherman-aquarium/shermans/Makefile
index 037f764..08ca4a8 100644
--- a/sherman-aquarium/shermans/Makefile
+++ b/sherman-aquarium/shermans/Makefile
@@ -11,17 +11,17 @@ GNOMEDIR = /usr
 INSTALL_PATH=$(DESTDIR)/usr
 
 # Setting up the CFLAGS and LDFLAGS variables 
-CFLAGS += -Wall -Wno-strict-aliasing -O3 -DIMAGE_PATH=\"/usr/share/pixmaps/shermans\"      -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/dbus-1.0/include  
+CFLAGS += -Wall -Wno-strict-aliasing -O3 -DIMAGE_PATH=\"/usr/share/pixmaps/shermans\"    -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DMAEMO_CHANGES -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12   -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/dbus-1.0/include  
 LDFLAGS_GAI = $(LDFLAGS)   
-LDFLAGS_SDL = $(LDFLAGS)   
+LDFLAGS_SDL = $(LDFLAGS) -L/usr/lib -lSDL  -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0  
 
 OBJS = fish.o background.o bubble.o draw.o bottom.o soundeffects.o images.o
 OBJS_GAI = settings.o pref.o date.o clock.o matrix.o over.o thermometer.o leds.o aquarium.o tetris.o plasma.o  status_linux26.o
 OBJS_SDL = screensaver.o grabscreen.o
 
-.PHONY: all install clean   install-images  
+.PHONY: all install clean  shermans install-images  install_screensaver
 
-all:  
+all:  shermans
 
 shermans_applet: $(OBJS_GAI) $(OBJS)
 	$(CC) -o shermans_applet $(OBJS) $(OBJS_GAI) $(LDFLAGS_GAI)
@@ -30,7 +30,7 @@ shermans_applet: $(OBJS_GAI) $(OBJS)
 shermans: $(OBJS) $(OBJS_SDL)
 	$(CC) -o shermans $(OBJS) $(OBJS_SDL) $(LDFLAGS_SDL) -ldbus-1 -lpthread -losso -ldbus-glib-1 -ldbus-1 -lpthread -lgobject-2.0 -lglib-2.0
 
-install:    install-images  
+install:   shermans install-images  install_screensaver
 
 install_applet: 
 	install -d $(INSTALL_PATH)/bin
@@ -39,7 +39,7 @@ install_applet:
 	install -m 644 ../shermans_icon.png $(INSTALL_PATH)/share/pixmaps
 install_screensaver: shermans
 	install -d $(INSTALL_PATH)/bin
-	install -m 755  $(INSTALL_PATH)/bin
+	install -m 755 shermans $(INSTALL_PATH)/bin
 	install -d $(INSTALL_PATH)/share/xscreensaver/config
 	install -m 644 ../shermans.xml $(INSTALL_PATH)/share/xscreensaver/config
 
@@ -63,7 +63,7 @@ install-rox:
 	ln -s $(INSTALL_PATH)/bin/shermans_applet "$(DESTDIR)/Sherman's aquarium/shermans_applet"
 	install -m 644 AppInfo.xml "$(DESTDIR)/Sherman's aquarium"
 clean:
-	rm -rf *.o .xvpics *~  
+	rm -rf *.o .xvpics *~  shermans
 
 # Dependencies: