[dia] Single configuration file for msvc build dependencies
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Single configuration file for msvc build dependencies
- Date: Sun, 17 Apr 2011 12:06:00 +0000 (UTC)
commit 4352caa0c242ba994eae7da9838f4c1be9f68d8f
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.
(cherry picked from commit c60ae25c52f0961ba3aaa4c4acd11de00840b4ab)
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 8e3c6c6..01cdfb9 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
INCLUDES = \
-FImsvc_recommended_pragmas.h \
diff --git a/bindings/makefile.msc b/bindings/makefile.msc
index 4564716..b048376 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 PYTHON_VERSION
PYTHON_VERSION=23
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 0ee4094..8b280dc 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
INCLUDES = \
-FImsvc_recommended_pragmas.h \
diff --git a/objects/makefile.msc b/objects/makefile.msc
index 864cdc5..c6e9781 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
INCLUDES = \
-FImsvc_recommended_pragmas.h \
diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc
index 82fe3da..d4122fb 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
DEFINES = \
-DHAVE_CONFIG_H \
diff --git a/plug-ins/python/makefile.msc b/plug-ins/python/makefile.msc
index 6afb8fc..a76ef50 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
!IFNDEF PYTHON_VERSION
PYTHON_VERSION=23
diff --git a/tests/makefile.msc b/tests/makefile.msc
index c66f42a..318a28a 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
################################################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]