X-Git-Url: http://git.maemo.org/git/?p=shermanaquarium;a=blobdiff_plain;f=sherman-aquarium%2Fshermans%2FMakefile;h=08ca4a889efecf28a469c8e947ea4e855713e817;hp=6ec29dd2cc0cbd071f413da7bafca157dba779a5;hb=b44079dea4687f1f6e1d555b3052c07b056f506a;hpb=882cf8ed52d7dffe3c026d8b6dd4023079d97de3

diff --git a/sherman-aquarium/shermans/Makefile b/sherman-aquarium/shermans/Makefile
index 6ec29dd..08ca4a8 100644
--- a/sherman-aquarium/shermans/Makefile
+++ b/sherman-aquarium/shermans/Makefile
@@ -8,31 +8,31 @@ CC = cc
 PREFIX = /usr
 GNOMEDIR = /usr
 
-INSTALL_PATH=$(DESTDIR)$(GNOMEDIR)
+INSTALL_PATH=$(DESTDIR)/usr
 
 # Setting up the CFLAGS and LDFLAGS variables 
-CFLAGS += -Wall -Wno-strict-aliasing -O3 -DIMAGE_PATH=\"/usr/share/pixmaps/shermans\" -DGAI -pthread -DORBIT2=1 -I/usr/include/gtk-2.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/panel-2.0 -I/usr/include/gtkglext-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/libpng12 -I/usr/include/libgnomeui-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gail-1.0 -I/usr/lib/gtkglext-1.0/include    -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -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/freetype2 -I/usr/include/libpng12  
-LDFLAGS_GAI = $(LDFLAGS) -pthread -Wl,--export-dynamic -L/usr/lib/lib -lgai -lpangoft2-1.0 -lpanel-applet-2 -lgtkglext-x11-1.0 -lgnomeui-2 -lbonoboui-2 -lgnomevfs-2 -lgconf-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -lgdkglext-x11-1.0 -lGLU -lGL -lXmu -lXt -lSM -lICE -lgtk-x11-2.0 -lpangox-1.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0    
-LDFLAGS_SDL = $(LDFLAGS) -L/usr/lib -lSDL  -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+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) -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 shermans_applet shermans install-images install_applet install_screensaver
+.PHONY: all install clean  shermans install-images  install_screensaver
 
-all: shermans_applet shermans
+all:  shermans
 
 shermans_applet: $(OBJS_GAI) $(OBJS)
 	$(CC) -o shermans_applet $(OBJS) $(OBJS_GAI) $(LDFLAGS_GAI)
 
 
 shermans: $(OBJS) $(OBJS_SDL)
-	$(CC) -o shermans $(OBJS) $(OBJS_SDL) $(LDFLAGS_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:  shermans_applet shermans install-images install_applet install_screensaver
+install:   shermans install-images  install_screensaver
 
-install_applet: install-gnome
+install_applet: 
 	install -d $(INSTALL_PATH)/bin
 	install -m 755 shermans_applet $(INSTALL_PATH)/bin
 	install -d $(INSTALL_PATH)/share/pixmaps/
@@ -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 *~ shermans_applet shermans
+	rm -rf *.o .xvpics *~  shermans
 
 # Dependencies: