thank you for all makefile patches. Very good work. Everything I need to change is now in "config.nmake".
Attached are two patches:
The first one is fixing config.nmake.
You need a few more CFLAGS, if you want compile Ethereal with GLib2 and GTK2.
There are more changes necessary, if you want to compile with GLib2 and GTK1 packages from the GTK+-for-Win32 site.
the second patch contains a small fix for build-cleaning process.
Best Regards,
Lars Roland
Index: ethereal/plugins/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/plugins/Makefile.nmake,v
retrieving revision 1.19
diff -u -r1.19 Makefile.nmake
--- ethereal/plugins/Makefile.nmake 14 Jun 2003 20:35:58 -0000 1.19
+++ ethereal/plugins/Makefile.nmake 15 Jun 2003 12:11:57 -0000
@@ -69,4 +69,6 @@
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../pcli
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+ cd ../rtnet
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..Index: config.nmake
===================================================================
RCS file: /cvsroot/ethereal/config.nmake,v
retrieving revision 1.48
diff -u -r1.48 config.nmake
--- config.nmake 16 Jun 2003 07:58:26 -0000 1.48
+++ config.nmake 16 Jun 2003 18:07:37 -0000
@@ -85,10 +85,12 @@
# was necessary.
#
!IFDEF GLIB_GTK_DIR
-GLIB_CFLAGS=/I$(GTK_GLIB_DIR)\include\glib-$(GLIB_VERSION)
-GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_GLIB_DIR)\include\gtk-$(GTK_VERSION) \
- /I$(GTK_GLIB_DIR)\include\atk-1.0 \
- /I$(GTK_GLIB_DIR)\include\pango-1.0
+GLIB_CFLAGS=/I$(GLIB_GTK_DIR)\include\glib-$(GLIB_VERSION) \
+ /I$(GLIB_GTK_DIR)\lib\glib-$(GLIB_VERSION)\include
+GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GLIB_GTK_DIR)\include\gtk-$(GTK_VERSION) \
+ /I$(GLIB_GTK_DIR)\lib\gtk-$(GTK_VERSION)\include \
+ /I$(GLIB_GTK_DIR)\include\atk-1.0 \
+ /I$(GLIB_GTK_DIR)\include\pango-1.0
GLIB_LIBS=$(GLIB_GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \
$(GLIB_GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
$(GLIB_GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib
