[dia] Deploy custom_lines.dll and Database.dll. Reflect XPM deletions in installer.

[Steffen Macke <sdteffen src gnome org>]

commit dc55f0050b706e1e0877d5096350c097c1f09cb7
Author: Steffen Macke <sdteffen sdteffen de>
Date:   Fri May 1 11:39:34 2009 +0200

    Deploy custom_lines.dll and Database.dll. Reflect XPM deletions in installer.
---
 installer/win32/dia.nsi |   16 +++-------------
 makefile.msc            |    8 ++++++++
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/installer/win32/dia.nsi b/installer/win32/dia.nsi
index 787c6e0..b0698f2 100644
--- a/installer/win32/dia.nsi
+++ b/installer/win32/dia.nsi
@@ -280,6 +280,8 @@ ${File} "..\..\plug-ins\cairo\" "cairo.dll"
 ${File} "..\..\plug-ins\cgm\" "cgm.dll"
 ${File} "..\..\objects\chronogram\" "chronogram.dll"
 ${File} "..\..\objects\custom\" "custom.dll"
+${File} "..\..\objects\custom_lines\" "custom_lines.dll"
+${File} "..\..\objects\Database\" "Database.dll"
 # TODO: re-enable drs plug-in once its ready
 #${File} "..\..\plug-ins\drs\" "drs.dll"
 ${File} "..\..\plug-ins\dxf\" "dxf.dll"
@@ -2100,6 +2102,7 @@ ${File} "..\..\sheets\" "ciscotelephony.sheet"
 ${File} "..\..\sheets\" "civil.sheet"
 ${File} "..\..\sheets\" "Contact.sheet"
 ${File} "..\..\sheets\" "Cybernetics.sheet"
+${File} "..\..\sheets\" "Database.sheet"
 ${File} "..\..\sheets\" "Electric.sheet"
 ${File} "..\..\sheets\" "ER.sheet"
 ${File} "..\..\sheets\" "Flowchart.sheet"
@@ -2270,11 +2273,8 @@ ${File} "..\..\sheets\SISSI\" "aircooler.png"
 ${File} "..\..\sheets\SISSI\" "aircooler_icon.png"
 ${File} "..\..\sheets\SISSI\" "alarm_center.png"
 ${File} "..\..\sheets\SISSI\" "analyse.png"
-${File} "..\..\sheets\SISSI\" "analyse.xpm"
 ${File} "..\..\sheets\SISSI\" "barriere.png"
 ${File} "..\..\sheets\SISSI\" "barriere_icon.png"
-${File} "..\..\sheets\SISSI\" "broken-chain.xpm"
-${File} "..\..\sheets\SISSI\" "broken.xpm"
 ${File} "..\..\sheets\SISSI\" "camera_interphone.png"
 ${File} "..\..\sheets\SISSI\" "camera_interphone_icon.png"
 ${File} "..\..\sheets\SISSI\" "capteur_brise_glace.png"
@@ -2326,7 +2326,6 @@ ${File} "..\..\sheets\SISSI\" "filtre_air.png"
 ${File} "..\..\sheets\SISSI\" "filtre_air_icon.png"
 ${File} "..\..\sheets\SISSI\" "hub.png"
 ${File} "..\..\sheets\SISSI\" "ibm_mini.png"
-${File} "..\..\sheets\SISSI\" "info.xpm"
 ${File} "..\..\sheets\SISSI\" "info.png"
 ${File} "..\..\sheets\SISSI\" "information.png"
 ${File} "..\..\sheets\SISSI\" "key.png"
@@ -2338,10 +2337,7 @@ ${File} "..\..\sheets\SISSI\" "lecteur_badge_clavier_icon.png"
 ${File} "..\..\sheets\SISSI\" "lecteur_biometrique.png"
 ${File} "..\..\sheets\SISSI\" "lecteur_biometrique_icon.png"
 ${File} "..\..\sheets\SISSI\" "logiciel.png"
-${File} "..\..\sheets\SISSI\" "logiciel.xpm"
-${File} "..\..\sheets\SISSI\" "menace.xpm"
 ${File} "..\..\sheets\SISSI\" "meuble.png"
-${File} "..\..\sheets\SISSI\" "meuble.xpm"
 ${File} "..\..\sheets\SISSI\" "modem.png"
 ${File} "..\..\sheets\SISSI\" "onduleur.png"
 ${File} "..\..\sheets\SISSI\" "onduleur_icon.png"
@@ -2350,7 +2346,6 @@ ${File} "..\..\sheets\SISSI\" "pc.png"
 ${File} "..\..\sheets\SISSI\" "pda.png"
 ${File} "..\..\sheets\SISSI\" "pda_icon.png"
 ${File} "..\..\sheets\SISSI\" "personne.png"
-${File} "..\..\sheets\SISSI\" "personne.xpm"
 ${File} "..\..\sheets\SISSI\" "phone.png"
 ${File} "..\..\sheets\SISSI\" "pompe.png"
 ${File} "..\..\sheets\SISSI\" "pompe_icon.png"
@@ -2363,14 +2358,9 @@ ${File} "..\..\sheets\SISSI\" "router.png"
 ${File} "..\..\sheets\SISSI\" "safe.png"
 ${File} "..\..\sheets\SISSI\" "safe_icon.png"
 ${File} "..\..\sheets\SISSI\" "sauvegarde.png"
-${File} "..\..\sheets\SISSI\" "sauvegarde.xpm"
 ${File} "..\..\sheets\SISSI\" "si.png"
-${File} "..\..\sheets\SISSI\" "si.xpm"
-${File} "..\..\sheets\SISSI\" "sissi_object.xpm"
 ${File} "..\..\sheets\SISSI\" "storage_array.png"
-${File} "..\..\sheets\SISSI\" "support.xpm"
 ${File} "..\..\sheets\SISSI\" "tourniquet.png"
-${File} "..\..\sheets\SISSI\" "unbroken-chain.xpm"
 ${File} "..\..\sheets\SISSI\" "ventilateur.png"
 ${File} "..\..\sheets\SISSI\" "ventilateur_axial.png"
 ${File} "..\..\sheets\SISSI\" "ventilateur_axial_icon.png"
diff --git a/makefile.msc b/makefile.msc
index 77f8ebe..6270cf3 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -19,6 +19,8 @@ full: 	build \
 #	build\win32\dia\bondgraph.dll \
 	build\win32\dia\chronogram.dll \
 	build\win32\dia\custom.dll \
+	build\win32\dia\custom_lines.dll \
+	build\win32\dia\Database.dll \
 	build\win32\dia\drs.dll \
 	build\win32\dia\er.dll \
 	build\win32\dia\flowchart.dll \
@@ -143,6 +145,12 @@ build\win32\dia\chronogram.dll: build\win32\dia objects\chronogram\chronogram.dl
 build\win32\dia\custom.dll: build\win32\dia objects\custom\custom.dll
 	copy objects\custom\custom.dll build\win32\dia
 	
+build\win32\dia\custom_lines.dll: build\win32\dia objects\custom_lines\custom_lines.dll
+	copy objects\custom_lines\custom_lines.dll build\win32\dia
+
+build\win32\dia\Database.dll: build\win32\dia objects\Database\Database.dll
+	copy objects\Database\Database.dll build\win32\dia
+	
 build\win32\dia\drs.dll: build\win32\dia plug-ins\drs\drs.dll
 	copy plug-ins\drs\drs.dll build\win32\dia