fixed conflict

[shermanaquarium] / sherman-aquarium / shermans / Makefile

diff --git a/sherman-aquarium/shermans/Makefile b/sherman-aquarium/shermans/Makefile
index 6ef424e..08ca4a8 100644 (file)
--- a/sherman-aquarium/shermans/Makefile
+++ b/sherman-aquarium/shermans/Makefile
@@ -11,7 +11,7 @@ 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/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  
+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  
 
@@ -28,7 +28,7 @@ shermans_applet: $(OBJS_GAI) $(OBJS)
 
 
 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 install-images  install_screensaver