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

[mldonkey-commits]

Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.122 mldonkey/config/Makefile.in:1.123
--- mldonkey/config/Makefile.in:1.122   Sun Oct 23 20:31:34 2005
+++ mldonkey/config/Makefile.in Thu Oct 27 09:44:31 2005
@@ -99,7 +99,7 @@
 
 INCLUDES += $(foreach file, $(SUBDIRS), -I $(file))
 
-CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES)
+CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS)
 
 # use_tags$(EXE) 
 TARGETS= mlnet$(EXE) 
@@ -131,8 +131,6 @@
 
 LIBS_flags += -ccopt "$(LDFLAGS) $(CPPFLAGS)" -cclib "$(LIBS)"
 
-LIBS_flags += -ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS)"
-
 ifeq ("$(OS_FILES2)", "mingw")
   LIBS_flags += -cclib "-lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 
-lshell32 -lole32 resfile.o"
 endif
@@ -800,9 +798,9 @@
 ifneq ("$(GUI)" , "no")
   ifeq ("$(GUI)", "newgui2")
     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
+    GTK_LIBS_byte=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 
$(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma
+    GTK_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 
$(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
+    GTK_STATIC_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I 
+lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa
   else
     SUBDIRS += $(SRC_GUI) $(CONFIGWIN) $(OKEY) $(GPATTERN) $(ICONS_CHOICE) 
+lablgtk $(SRC_PROGRESS)
     GTK_LIBS_byte=-I +lablgtk $(LABLGL_CMA) lablgtk.cma