[dia/dia-0-97] Single configuration file for msvc build dependencies

[Hans Breuer <hans src gnome org>]

commit c60ae25c52f0961ba3aaa4c4acd11de00840b4ab
Author: Hans Breuer <hans breuer org>
Date:   Sun Apr 3 19:29:40 2011 +0200

    Single configuration file for msvc build dependencies
    
    To simplify switching between different dependency version
    the inclusion of $(TOP)\glib\build\win32\make.msc is done
    by a single file dia-make.msc.
    This should not change anything for people having only one
    GLib version installed.

 app/makefile.msc             |    2 +-
 bindings/makefile.msc        |    4 ++--
 dia-make.msc                 |    1 +
 installer/win32/makefile.msc |    2 +-
 lib/makefile.msc             |    2 +-
 objects/makefile.msc         |    3 +--
 plug-ins/makefile.msc        |    2 +-
 plug-ins/python/makefile.msc |    4 ++--
 tests/makefile.msc           |    5 ++---
 9 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/app/makefile.msc b/app/makefile.msc
index 8e45a49..4662dd9 100644
--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -1,7 +1,7 @@
 TOP = ..\..
 PRJ_TOP = ..
 PACKAGE = dia
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\dia-make.msc
 
 # -DWIN32 for newer libxml versions
 # not yet 
diff --git a/bindings/makefile.msc b/bindings/makefile.msc
index 545770c..59b1854 100644
--- a/bindings/makefile.msc
+++ b/bindings/makefile.msc
@@ -1,6 +1,6 @@
+PRJ_TOP=..
 TOP = ..\..
-
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\dia-make.msc
 
 !IFNDEF DEBUG
 PYTHON = ..\..\..\python23
diff --git a/dia-make.msc b/dia-make.msc
new file mode 100644
index 0000000..9e33a88
--- /dev/null
+++ b/dia-make.msc
@@ -0,0 +1 @@
+!INCLUDE $(TOP)\glib\build\win32\make.msc
diff --git a/installer/win32/makefile.msc b/installer/win32/makefile.msc
index ca8a56c..9e86234 100755
--- a/installer/win32/makefile.msc
+++ b/installer/win32/makefile.msc
@@ -1,6 +1,6 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\dia-make.msc
 
 PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 	-I.. -I..\.. \
diff --git a/lib/makefile.msc b/lib/makefile.msc
index 1af2d7f..d7223f5 100644
--- a/lib/makefile.msc
+++ b/lib/makefile.msc
@@ -1,7 +1,7 @@
 TOP = ..\..
 PRJ_TOP = ..
 PACKAGE = libdia
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\dia-make.msc
 
 # don't break on win32 only with it
 #	-DGTK_DISABLE_DEPRECATED \
diff --git a/objects/makefile.msc b/objects/makefile.msc
index efd57f1..98e4b6e 100644
--- a/objects/makefile.msc
+++ b/objects/makefile.msc
@@ -33,8 +33,7 @@ sub-clean:
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PKG_DEF = ..\objects.def
-
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\dia-make.msc
 
 PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 	$(GLIB_CFLAGS) $(GTK2_CFLAGS) $(INTL_CFLAGS) \
diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc
index d80ab1e..9ce3233 100644
--- a/plug-ins/makefile.msc
+++ b/plug-ins/makefile.msc
@@ -30,7 +30,7 @@ TOP = ..\..\..
 PRJ_TOP = ..\..
 PKG_DEF = ..\objects.def
 
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\dia-make.msc
 
 PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 	$(GLIB_CFLAGS) $(GTK2_CFLAGS) \
diff --git a/plug-ins/python/makefile.msc b/plug-ins/python/makefile.msc
index 69c457e..e010361 100644
--- a/plug-ins/python/makefile.msc
+++ b/plug-ins/python/makefile.msc
@@ -1,6 +1,6 @@
+PRJ_TOP=..\..
 TOP = ..\..\..
-
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\dia-make.msc
 
 PYTHON = ..\..\..\..\python23
 !IFNDEF DEBUG
diff --git a/tests/makefile.msc b/tests/makefile.msc
index b2f6cbf..3980fc0 100644
--- a/tests/makefile.msc
+++ b/tests/makefile.msc
@@ -1,9 +1,8 @@
 ## Makefile for building the GLib test programs with Microsoft C
 ## Use: nmake -f makefile.msc check
-
+PRJ_TOP=..
 TOP = ..\..
-
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\dia-make.msc
 
 ################################################################