diff -bNur -x CVS planner/Makefile.win32 planner-new/Makefile.win32
--- planner/Makefile.win32	Wed Dec 31 19:00:00 1969
+++ planner-new/Makefile.win32	Thu Apr 28 23:20:30 2005
@@ -0,0 +1,159 @@
+#
+# Makefile.win32
+#
+
+SUBDIRS=libplanner src po
+
+VERSION := `sed <configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'`
+
+ifeq ($(DESTDIR),)
+export DESTDIR=$(HOME)
+endif
+
+ifeq ($(PREFIX),)
+export PREFIX=$(HOME)/dev
+endif
+
+export CFLAGS := $(CFLAGS) -Wall -Wunused -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare -Werror
+
+RECURSIVE_TARGETS = all-recursive clean-recursive install-recursive uninstall-recursive
+
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; version=$(VERSION); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) -f Makefile.win32 $$local_target VERSION=$$version) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) -f Makefile.win32 "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+all: all-recursive
+all-am:
+
+clean: clean-recursive
+
+clean-am:
+	rm -f config.h
+
+DTD = \
+	mrproject-0.5.1.dtd		\
+	mrproject-0.6.dtd
+
+GLADE = \
+	add-predecessor.glade		\
+	calendar-dialog.glade		\
+	column-dialog.glade		\
+	group-dialog.glade		\
+	new-property.glade		\
+	project-properties.glade	\
+	property-dialog.glade		\
+	resource-dialog.glade		\
+	resource-input-dialog.glade	\
+	sql.glade			\
+	task-dialog.glade		\
+	task-input-dialog.glade		\
+	task-date-widget.glade		\
+	eds.glade
+
+IMAGES = 				\
+	tasks.png			\
+	gantt.png			\
+	resources.png			\
+	resources_usage.png		\
+	24_insert_task.png		\
+	24_remove_task.png		\
+	24_unlink_task.png		\
+	24_link_task.png		\
+	24_indent_task.png		\
+	24_unindent_task.png		\
+	24_insert_resource.png		\
+	24_remove_resource.png		\
+	24_edit_resource.png		\
+	24_groups.png			\
+	24_task_down.png		\
+	24_task_up.png			\
+	gnome-planner.png
+
+SQL = \
+	database-0.13.sql		\
+	database-0.11.sql		\
+	database.sql			\
+	upgrade-0.11-0.13.sql		\
+	upgrade-0.6.x-0.11.sql
+
+STYLESHEETS = \
+	planner2html.xsl		\
+	html1_css.xsl			\
+        html1_gantt.xsl			\
+        html1_resources.xsl		\
+        html1_tasks.xsl			\
+	planner2plannerv011.xsl		\
+	msp2planner.xsl
+
+UI = \
+	gantt-view.ui		\
+	task-view.ui		\
+	gantt-view.ui		\
+	html-plugin.ui		\
+	main-window.ui		\
+	resource-view.ui	\
+	sql-plugin.ui		\
+	task-view.ui		\
+	xml-planner-plugin.ui	\
+	time-table-view.ui	\
+	eds-plugin.ui		\
+	msp-plugin.ui
+
+COPYFILES = \
+	mkdir -p $$dest; \
+	for file in $$list; do \
+	  cp $$src/$$file $$dest; \
+	done
+
+RMFILES = \
+	for file in $$list; do \
+	  rm -f $$dest/$$file; \
+	done
+
+install: install-recursive
+install-am:
+	-mkdir -p $(DESTDIR)/planner
+	cp COPYING $(DESTDIR)/planner
+	dest=$(DESTDIR)/planner/share/planner/dtd; list='$(DTD)'; src=data/dtd; \
+	$(COPYFILES)
+	dest=$(DESTDIR)/planner/share/planner/glade; list='$(GLADE)'; src=data/glade; \
+	$(COPYFILES)
+	dest=$(DESTDIR)/planner/share/pixmaps/planner; list='$(IMAGES)'; src=data/images; \
+	$(COPYFILES)
+	dest=$(DESTDIR)/planner/share/planner/sql; list='$(SQL)'; src=data/sql; \
+	$(COPYFILES)
+	dest=$(DESTDIR)/planner/share/planner/stylesheets; list='$(STYLESHEETS)'; src=data/stylesheets; \
+	$(COPYFILES)
+	dest=$(DESTDIR)/planner/share/planner/ui; list='$(UI)'; src=data/ui; \
+	$(COPYFILES)
+
+uninstall: uninstall-recursive
+uninstall-am:
+	rm -f $(DESTDIR)/planner/COPYING
+	dest=$(DESTDIR)/planner/share/planner/dtd; list='$(DTD)'; \
+	$(RMFILES)
+	dest=$(DESTDIR)/planner/share/planner/glade; list='$(GLADE)'; \
+	$(RMFILES)
+	dest=$(DESTDIR)/planner/share/pixmaps/planner; list='$(IMAGES)'; \
+	$(RMFILES)
+	dest=$(DESTDIR)/planner/share/planner/sql; list='$(SQL)'; \
+	$(RMFILES)
+	dest=$(DESTDIR)/planner/share/planner/stylesheets; list='$(STYLESHEETS)'; \
+	$(RMFILES)
+	dest=$(DESTDIR)/planner/share/planner/ui; list='$(UI)'; \
+	$(RMFILES)
diff -bNur -x CVS planner/config.h.win32 planner-new/config.h.win32
--- planner/config.h.win32	Wed Dec 31 19:00:00 1969
+++ planner-new/config.h.win32	Mon Apr 25 09:29:23 2005
@@ -0,0 +1,7 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define GETTEXT_PACKAGE "planner"
+#define PACKAGE "planner"
+#define GNOMELOCALEDIR "share/locale"
+#endif
Binary files planner/data/images/gnome-planner.ico and planner-new/data/images/gnome-planner.ico differ
diff -bNur -x CVS planner/libplanner/Makefile.win32 planner-new/libplanner/Makefile.win32
--- planner/libplanner/Makefile.win32	Wed Dec 31 19:00:00 1969
+++ planner-new/libplanner/Makefile.win32	Thu Apr 28 07:38:28 2005
@@ -0,0 +1,191 @@
+#
+# Makefile.win32
+#
+
+#
+# PATHS
+#
+
+# Compiler Options
+
+ifeq ($(DESTDIR),)
+DESTDIR=$(HOME)
+endif
+
+DLL_LD_FLAGS += -Wl,--enable-auto-image-base
+
+ifeq ($(PREFIX),)
+export PREFIX=$(HOME)/dev
+endif
+
+DEPS = gtk+-2.0
+
+ifdef HAVE_GDA
+DEPS := $(DEPS),libgda
+endif
+
+CFLAGS := $(CFLAGS) -mms-bitfields -mno-cygwin -I.. `pkg-config --cflags $(DEPS)` -I/usr/include -I$(PREFIX)/include
+
+DEFINES = -DWIN32 \
+	-DWIN32_LEAN_AND_MEAN
+
+C_SRC = \
+	mrp-marshal.c				\
+	mrp-application.c			\
+	mrp-assignment.c			\
+	mrp-calendar.c				\
+	mrp-day.c				\
+	mrp-group.c				\
+	mrp-object.c				\
+	mrp-file-module.c			\
+	mrp-project.c				\
+	mrp-resource.c				\
+	mrp-storage-module.c			\
+	mrp-storage-module-factory.c		\
+	mrp-task-manager.c			\
+	mrp-task.c				\
+	mrp-relation.c				\
+	mrp-types.c				\
+	mrp-property.c				\
+	mrp-time.c				\
+	mrp-error.c				\
+	mrp-paths-win32.c
+
+#
+# Storage modules
+#
+
+libstorage_mrproject_1_la_SOURCES =			\
+	mrp-storage-mrproject.c				\
+	mrp-parser.c
+
+libstorage_mrproject_1_la_CFLAGS = `pkg-config --cflags libxml-2.0`
+
+libstorage_mrproject_1_la_LDFLAGS =  -avoid-version -module `pkg-config --libs libxml-2.0` -lplanner-1 -L.
+
+ifdef HAVE_GDA
+libstorage_sql_la_SOURCES = 			\
+	mrp-storage-sql.c			\
+	mrp-sql.c
+
+libstorage_sql_la_CFLAGS = `pkg-config --cflags libgda`
+libstorage_sql_la_LDFLAGS =  -avoid-version -module `pkg-config --libs libgda` -lplanner-1 -L.
+endif
+
+libmrp_xml_la_SOURCES =					\
+	mrp-xml.c					\
+	mrp-old-xml.c
+
+libmrp_xml_la_CFLAGS =
+libmrp_xml_la_LDFLAGS = -avoid-version -module `pkg-config --libs libxml-2.0` -lplanner-1 -L.
+
+libmrp_xsl_la_SOURCES = \
+	mrp-xsl.c
+
+libmrp_xsl_la_CFLAGS = \
+	`pkg-config --cflags libxslt`
+
+libmrp_xsl_la_LIBADD = `pkg-config --libs libxslt`
+libmrp_xsl_la_LDFLAGS = -avoid-version -module `pkg-config --libs libexslt` -lplanner-1 -L.
+
+OBJECTS_XSL = $(libmrp_xsl_la_SOURCES:%.c=%.o)
+
+OBJECTS_STORAGE = $(libstorage_mrproject_1_la_SOURCES:%.c=%.o)
+
+OBJECTS_FILE = $(libmrp_xml_la_SOURCES:%.c=%.o)
+
+OBJECTS_SQL = $(libstorage_sql_la_SOURCES:%.c=%.o)
+
+OBJECTS = $(C_SRC:%.c=%.o)
+
+
+##
+## LIBRARIES
+##
+
+LIBS = `pkg-config --libs gtk+-2.0`
+
+##
+## RULES
+##
+
+# How to make a C file
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(libstorage_mrproject_1_la_CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<
+
+##
+## TARGET DEFINITIONS
+##
+
+.PHONY: all clean
+
+TARGETS = \
+	libplanner-1.dll \
+	libstorage-mrproject-1.dll \
+	libmrp-xml.dll \
+	libmrp-xsl.dll
+
+ifdef HAVE_GDA
+TARGETS := $(TARGETS) \
+	libstorage-sql-1.dll
+endif
+
+all: \
+	../config.h \
+	mrp-marshal.h \
+	$(TARGETS)
+
+mrp-marshal.h: Makefile.win32 mrp-marshal.list
+	glib-genmarshal --prefix=mrp_marshal mrp-marshal.list --header > xgen-gmh \
+	&& (cmp -s xgen-gmh mrp-marshal.h || cp xgen-gmh mrp-marshal.h) \
+	&& rm -f xgen-gmh xgen-gmh~
+
+mrp-marshal.c: Makefile.win32 mrp-marshal.list
+	(echo "#include \"mrp-marshal.h\""; glib-genmarshal --prefix=mrp_marshal mrp-marshal.list --body) > xgen-gmc \
+	&& cp xgen-gmc mrp-marshal.c \
+	&& rm -f xgen-gmc xgen-gmc~
+
+../config.h: ../config.h.win32
+	cp ../config.h.win32 ../config.h
+
+##
+## BUILD DLL
+##
+
+libplanner-1.dll: $(OBJECTS)
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) --out-implib,libplanner-1.dll.a -Wl,-Map -Wl,libplanner-1.map -Wl,--cref -o libplanner-1.dll
+
+libstorage-mrproject-1.dll: $(OBJECTS_STORAGE)
+	$(CC) -shared $(OBJECTS_STORAGE) $(LIB_PATHS) $(LIBS) $(libstorage_mrproject_1_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libstorage-mrproject-1.map -Wl,--cref -o libstorage-mrproject-1.dll
+
+libmrp-xml.dll: $(OBJECTS_FILE)
+	$(CC) -shared $(OBJECTS_FILE) $(LIB_PATHS) $(LIBS) $(libmrp_xml_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libmrp-xml.map -Wl,--cref -o libmrp-xml.dll
+
+libmrp-xsl.dll: $(OBJECTS_XSL)
+	$(CC) -shared $(OBJECTS_XSL) $(LIB_PATHS) $(LIBS) $(libmrp_xsl_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libmrp-xsl.map -Wl,--cref -o libmrp-xsl.dll
+
+libstorage-sql-1.dll: $(OBJECTS_SQL)
+	$(CC) -shared $(OBJECTS_SQL) $(LIB_PATHS) $(LIBS) $(libstorage_sql_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libstorage-sql-1.map -Wl,--cref -o libstorage-sql-1.dll
+
+##
+## CLEAN RULES
+##
+
+clean:
+	rm -f *.o
+	rm -f *.dll
+	rm -f *.map
+	rm -f mrp-marshal.c mrp-marshal.h
+	rm -f *.a	
+install: all
+	-mkdir -p $(DESTDIR)/planner/lib/planner/file-modules
+	-mkdir -p $(DESTDIR)/planner/lib/planner/storage-modules
+	cp libplanner-1.dll $(DESTDIR)/planner
+	cp libmrp-*.dll $(DESTDIR)/planner/lib/planner/file-modules
+	cp libstorage-*.dll $(DESTDIR)/planner/lib/planner/storage-modules
+
+uninstall:
+	rm -f $(DESTDIR)/planner/libplanner-1.dll
+	rm -f $(DESTDIR)/planner/lib/planner/file-modules/libmrp-*.dll
+	rm -f $(DESTDIR)/planner/lib/planner/storage-modules/libstorage-*.dll
diff -bNur -x CVS planner/po/Makefile.win32 planner-new/po/Makefile.win32
--- planner/po/Makefile.win32	Wed Dec 31 19:00:00 1969
+++ planner-new/po/Makefile.win32	Thu Apr 21 22:59:25 2005
@@ -0,0 +1,53 @@
+#
+# Makefile.win32
+#
+
+MSGFMT=msgfmt
+
+ifeq ($(DESTDIR),)
+DESTDIR=$(HOME)
+endif
+
+CATALOGS=$(wildcard *.po)
+
+OBJECTS=$(CATALOGS:%.po=%.mo)
+
+##
+## RULES
+##
+
+# How to make a MO file
+
+%.mo: %.po
+	$(MSGFMT) -o $@ $<
+
+##
+## TARGET DEFINITIONS
+##
+
+.PHONY: all clean
+
+all: \
+	$(OBJECTS)
+
+##
+## CLEAN RULES
+##
+
+clean:
+	rm -f *.mo
+
+install: all
+	list='$(OBJECTS)'; for catalog in $$list; do \
+	  dest=$(DESTDIR)/planner/share/locale/`basename $$catalog .mo`/LC_MESSAGES; \
+	  echo "Installing $$catalog as $$dest/planner.mo"; \
+	  mkdir -p $$dest; \
+	  cp $$catalog $$dest/planner.mo; \
+	done;
+
+uninstall:
+	list='$(OBJECTS)'; for catalog in $$list; do \
+	  dest=$(DESTDIR)/planner/share/locale/`basename $$catalog .mo`/LC_MESSAGES; \
+	  echo "Uninstalling $$dest/planner.mo"; \
+	  rm -f $$dest/planner.mo; \
+	done;
diff -bNur -x CVS planner/src/Makefile.win32 planner-new/src/Makefile.win32
--- planner/src/Makefile.win32	Wed Dec 31 19:00:00 1969
+++ planner-new/src/Makefile.win32	Mon Apr 25 09:39:58 2005
@@ -0,0 +1,258 @@
+#
+# Makefile.win32
+#
+
+#
+# PATHS
+#
+
+# Compiler Options
+
+SUBSYTEM = -mwindows
+
+DLL_LD_FLAGS += -mms-bitfields -mno-cygwin -Wl,--enable-auto-image-base --no-undefined -Wl,--export-all -mwin32
+
+DEPS = libgnomecanvas-2.0,libglade-2.0,libgnomeprint-2.2,libgnomeprintui-2.2
+
+ifdef HAVE_GDA
+DEPS := $(DEPS),libgda
+endif
+
+ifeq ($(DESTDIR),)
+export DESTDIR=$(HOME)
+endif
+
+ifeq ($(PREFIX),)
+export PREFIX=$(HOME)/dev
+endif
+
+export CFLAGS := $(CFLAGS) -mms-bitfields -mno-cygwin -I.. `pkg-config --cflags $(DEPS)` -I/usr/include -I../libplanner -I$(PREFIX)/include
+
+SUBSYSTEM = -mwindows
+
+ifdef HAVE_PYTHON
+CFLAGS := $(CFLAGS) -I$(PYTHON_DIR)/include -I$(PYTHON_DIR)/include/pygtk-2.0
+endif
+
+DEFINES = -DWIN32 \
+	-DWIN32_LEAN_AND_MEAN \
+	-DUSE_STABLE_LIBGNOMEUI \
+	-DVERSION=\""$(VERSION)\""
+
+C_SRC = \
+	planner-marshal.c		\
+	eel-canvas-rect.c		\
+	planner-application.c		\
+	planner-assignment-model.c	\
+	planner-calendar.c		\
+	planner-calendar-dialog.c	\
+	planner-calendar-selector.c	\
+	planner-canvas-line.c		\
+	planner-cell-renderer-date.c	\
+	planner-cell-renderer-list.c	\
+	planner-cell-renderer-popup.c	\
+	planner-cmd-manager.c		\
+	planner-column-dialog.c		\
+	planner-conf-win32.c		\
+	planner-day-type-dialog.c	\
+	planner-default-week-dialog.c	\
+	planner-format.c		\
+	planner-group-dialog.c		\
+	planner-group-model.c		\
+	planner-list-model.c		\
+	planner-main.c			\
+	planner-phase-dialog.c		\
+	planner-plugin.c		\
+	planner-plugin-loader.c		\
+	planner-popup-button.c		\
+	planner-popup-entry.c		\
+	planner-predecessor-model.c	\
+	planner-print-dialog.c		\
+	planner-print-job.c		\
+	planner-project-properties.c	\
+	planner-property-dialog.c	\
+	planner-property-model.c	\
+	planner-resource-cmd.c		\
+	planner-resource-dialog.c	\
+	planner-resource-input-dialog.c	\
+	planner-scale-utils.c		\
+	planner-sidebar.c		\
+	planner-table-print-sheet.c	\
+	planner-task-cmd.c		\
+	planner-task-date-widget.c	\
+	planner-task-dialog.c		\
+	planner-task-input-dialog.c	\
+	planner-util-win32.c		\
+	planner-view.c			\
+	planner-window.c		\
+	planner-working-time-dialog.c	\
+	$(gantt_task_source)		\
+	$(task_source)			\
+	$(resource_source)		\
+	$(usage_source)
+
+RC =	planner.rc
+
+gantt_task_source = 			\
+	planner-gantt-background.c	\
+	planner-gantt-header.c		\
+	planner-gantt-model.c		\
+	planner-task-tree.c		\
+	planner-task-popup.c 		\
+	planner-relation-arrow.c	\
+	planner-gantt-chart.c		\
+	planner-gantt-print.c		\
+	planner-gantt-row.c		\
+	planner-gantt-view.c		\
+	planner-task-view.c
+
+resource_source = 			\
+	planner-resource-view.c
+
+usage_source = 				\
+	planner-usage-view.c		\
+	planner-usage-chart.c		\
+	planner-usage-model.c		\
+	planner-usage-row.c		\
+	planner-usage-tree.c
+
+#
+# Plugins
+#
+
+ifdef HAVE_GDA
+libsql_plugin_la_SOURCES = planner-sql-plugin.c
+libsql_plugin_la_LDFLAGS = -avoid-version -module `pkg-config --libs libgda`
+libsql_plugin_la_CFLAGS = `pkg-config --cflags libgda`
+endif
+
+libhtml_plugin_la_SOURCES = planner-html-plugin.c
+libhtml_plugin_la_LDFLAGS = -avoid-version -module
+
+libxmlplanner_plugin_la_SOURCES = planner-xml-planner-plugin.c
+libxmlplanner_plugin_la_LDFLAGS = -avoid-version -module
+
+libmsp_plugin_la_SOURCES = planner-msp-plugin.c
+libmsp_plugin_la_LDFLAGS = -avoid-version -module `pkg-config --libs libxml-2.0,libexslt`
+
+ifdef HAVE_PYTHON
+libpython_plugin_la_SOURCES = planner-python-plugin.c
+libpython_plugin_la_LDFLAGS = -avoid-version -module -L$(PYTHON_DIR)/libs -l python24
+endif
+
+OBJECTS = $(C_SRC:%.c=%.o) $(RC:%.rc=%.o)
+
+OBJECTS_libsql_plugin_la = $(libsql_plugin_la_SOURCES:%.c=%.o)
+
+OBJECTS_libhtml_plugin_la = $(libhtml_plugin_la_SOURCES:%.c=%.o)
+
+OBJECTS_libxmlplanner_plugin_la = $(libxmlplanner_plugin_la_SOURCES:%.c=%.o)
+
+OBJECTS_libmsp_plugin_la = $(libmsp_plugin_la_SOURCES:%.c=%.o)
+
+OBJECTS_libpython_plugin_la = $(libpython_plugin_la_SOURCES:%.c=%.o)
+
+
+##
+## LIBRARIES
+##
+
+LIBS = -L$(PREFIX)/lib -leggrecent `pkg-config --libs libgnomecanvas-2.0,libglade-2.0,libgnomeprint-2.2,libgnomeprintui-2.2` -lplanner-1 -L../libplanner
+
+##
+## RULES
+##
+
+# How to make a C file
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<
+
+%.o: %.rc
+	windres -i $< -o $@
+
+##
+## TARGET DEFINITIONS
+##
+
+.PHONY: all clean
+
+TARGETS = \
+	planner-marshal.h \
+	planner.exe \
+	libxmlplanner-plugin.dll \
+	libmsp-plugin.dll \
+	libhtml-plugin.dll
+
+ifdef HAVE_GDA
+TARGETS := $(TARGETS) \
+	libsql-plugin.dll
+endif
+
+ifdef HAVE_PYTHON
+TARGETS := $(TARGETS) \
+	libpython-plugin.dll
+endif
+
+all: \
+	../config.h \
+	$(TARGETS)
+
+planner-marshal.h: planner-marshal.list
+	glib-genmarshal --prefix=planner_marshal planner-marshal.list --header > xgen-gmh \
+	&& (cmp -s xgen-gmh planner-marshal.h || cp xgen-gmh planner-marshal.h) \
+	&& rm -f xgen-gmh xgen-gmh~
+
+planner-marshal.c: planner-marshal.list
+	(echo "#include \"planner-marshal.h\""; glib-genmarshal --prefix=planner_marshal planner-marshal.list --body) > xgen-gmc \
+	&& cp xgen-gmc planner-marshal.c \
+	&& rm -f xgen-gmc xgen-gmc~
+
+../config.h: ../config.h.win32
+	cp ../config.h.win32 ../config.h
+
+##
+## BUILD EXE
+##
+
+planner.exe: $(OBJECTS)
+	$(CC) $(OBJECTS) $(LIBS) $(SUBSYSTEM) -Wl,-Map -Wl,planner.map -Wl,--cref --no-undefined -export-all -Wl,--output-def -Wl,planner.def -Wl,--out-implib=planner.a -o planner.exe
+
+libsql-plugin.dll: $(OBJECTS_libsql_plugin_la)
+	$(CC) -shared $(OBJECTS_libsql_plugin_la) planner.a $(LIBS) $(libsql_plugin_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libsql-plugin.map -Wl,--cref -o libsql-plugin.dll
+
+libhtml-plugin.dll: $(OBJECTS_libhtml_plugin_la)
+	$(CC) -shared $(OBJECTS_libhtml_plugin_la) planner.a $(LIBS) $(libhtml_plugin_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libhtml-plugin.map -Wl,--cref -o libhtml-plugin.dll
+
+libxmlplanner-plugin.dll: $(OBJECTS_libxmlplanner_plugin_la)
+	$(CC) -shared $(OBJECTS_libxmlplanner_plugin_la) planner.a $(LIBS) $(libxmlplanner_plugin_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libxmlplanner-plugin.map -Wl,--cref -o libxmlplanner-plugin.dll
+
+libmsp-plugin.dll: $(OBJECTS_libmsp_plugin_la)
+	$(CC) -shared $(OBJECTS_libmsp_plugin_la) planner.a $(LIBS) $(libmsp_plugin_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libmsp-plugin.map -Wl,--cref -o libmsp-plugin.dll
+
+libpython-plugin.dll: $(OBJECTS_libpython_plugin_la)
+	$(CC) -shared $(OBJECTS_libpython_plugin_la) planner.a $(LIBS) $(libpython_plugin_la_LDFLAGS) $(DLL_LD_FLAGS) -Wl,-Map -Wl,libpython-plugin.map -Wl,--cref -o libpython-plugin.dll
+
+##
+## CLEAN RULES
+##
+
+clean:
+	rm -f *.o
+	rm -f planner.exe
+	rm -f planner-marshal.c planner-marshal.h
+	rm -f *.dll
+	rm -f *.map
+	rm -f *.a
+	rm -f *.def
+
+install: all
+	-mkdir -p $(DESTDIR)/planner
+	cp planner.exe $(DESTDIR)/planner
+	-mkdir -p $(DESTDIR)/planner/lib/planner/plugins
+	cp lib*-plugin.dll $(DESTDIR)/planner/lib/planner/plugins
+
+uninstall:
+	rm -f $(DESTDIR)/planner/planner.exe
+	rm -f $(DESTDIR)/planner/libgantt-task.dll
+	rm -f $(DESTDIR)/planner/lib/planner/plugins/lib*-plugin.dll
diff -bNur -x CVS planner/src/planner-main.c planner-new/src/planner-main.c
--- planner/src/planner-main.c	Wed Apr 27 21:52:15 2005
+++ planner-new/src/planner-main.c	Thu Apr 28 07:41:36 2005
@@ -30,6 +30,9 @@
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
 #endif
+#ifdef WIN32
+#include <gtk/gtkicontheme.h>
+#endif
 #include "libplanner/mrp-paths.h"
 #include "planner-application.h"
 #include "planner-window.h"
@@ -79,9 +82,16 @@
 				      NULL);
 #endif
 
+#ifndef WIN32
 	filename = mrp_paths_get_image_dir ("gnome-planner.png");
 	gtk_window_set_default_icon_from_file (filename, NULL);
 	g_free (filename);
+#else
+	filename = g_win32_get_package_installation_subdirectory (NULL, NULL, "share/icons");
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default(),
+					   filename);
+	g_free (filename);
+#endif
 
 	application = planner_application_new ();
 
diff -bNur -x CVS planner/src/planner.rc planner-new/src/planner.rc
--- planner/src/planner.rc	Wed Dec 31 19:00:00 1969
+++ planner-new/src/planner.rc	Tue Apr  5 14:37:30 2005
@@ -0,0 +1,26 @@
+#define PLANNER_ICON 	101
+
+PLANNER_ICON		ICON "../data/images/gnome-planner.ico"
+
+1 VERSIONINFO
+FILEVERSION     0,13,90,0
+PRODUCTVERSION  0,13,90,0
+FILEFLAGSMASK   0x0000003FL
+FILEFLAGS       (0x00000008L|0x00000002L|0x00000001L)
+FILEOS          0x00010001L
+FILETYPE        0x00000001L
+FILESUBTYPE     0x00000000L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName",   "Imendio\0"
+            VALUE "FileDescription",   "Imendio Planner for Windows\0"
+            VALUE "FileVersion",       "0.13.90\0"
+            VALUE "InternalName",       "PLANNER" "\0"
+            VALUE "ProductName",      "Imendio Planner\0"
+            VALUE "ProuctVersion",       "0.13.90\0"
+        END
+    END
+END