[Mldonkey-commits] Changes to mldonkey/config/Makefile.in

[mldonkey-commits]

Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.99 mldonkey/config/Makefile.in:1.100
--- mldonkey/config/Makefile.in:1.99    Fri Jun 24 23:49:14 2005
+++ mldonkey/config/Makefile.in Sun Jul 10 13:28:50 2005
@@ -130,12 +130,14 @@
 
 LIBS_flags += -ccopt "$(LDFLAGS) $(CPPFLAGS)" -cclib "$(LIBS)"
 
+LIBS_flags += -ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS)"
+
 ifeq ("$(OS_FILES2)", "mingw")
-  LIBS_flags += -ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS) 
-lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 -lshell32 -lole32 
resfile.o"
+  LIBS_flags += -cclib "-lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 
-lshell32 -lole32 resfile.o"
 endif
 
 ifeq ("$(OS_FILES2)", "cygwin")
-  LIBS_flags += -ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS) 
-lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 -lshell32 -lole32 
resfile.o"
+  LIBS_flags += -cclib "-lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 
-lshell32 -lole32 resfile.o"
 endif
 
 ifeq ("$(ZLIB)" , "yes")
@@ -809,7 +811,7 @@
 
 ifeq ("$(COMPILE_GUI)" , "yes")
   ifeq ("$(USE_GTK2)", "yes")
-    SUBDIRS += $(SRC_GUI) $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2
+    SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) 
+lablgtk2
     GTK_LIBS_byte=-I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo 
lablrsvg.cma
     GTK_LIBS_opt=-I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx 
lablrsvg.cmxa
     GTK_STATIC_LIBS_opt=-I +lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
@@ -1185,10 +1187,14 @@
   $(SRC_GUI)/guiWindow.ml
 
 ifeq ("$(OS_FILES2)", "mingw")
-  GTK2GUI_SRCS += $(SRC_GUI)/win32/systraystubs.c $(SRC_GUI)/win32/systray.ml
+  GTK2GUI_SRCS += $(SRC_GUI)/win32/systraystubs.c
+else
+  GTK2GUI_SRCS += $(SRC_GUI)/x11/eggtrayicon.c $(SRC_GUI)/x11/eggtrayicon.h 
$(SRC_GUI)/x11/systraystubs.c
 endif
 
-GTK2GUI_SRCS += $(SRC_GUI)/guiMain.ml
+GTK2GUI_SRCS += \
+  $(SRC_GUI)/guiSystray.ml \
+  $(SRC_GUI)/guiMain.ml
 
 NEWGUI_SRCS=  \
   $(SRC_PROGRESS)/gui_progress.ml \