[dia] Cleanup of some makefile.msc improving the signal noise ratio

[Hans Breuer <hans src gnome org>]

commit 63eb3baa7e0e965d4b66de725ed2c307f5635aab
Author: Hans Breuer <hans breuer org>
Date:   Wed Aug 4 16:28:28 2010 +0200

    Cleanup of some makefile.msc improving the signal noise ratio

 app/makefile.msc     |   22 +++++++++-------------
 lib/makefile.msc     |    9 +--------
 objects/makefile.msc |   16 ++++++++--------
 3 files changed, 18 insertions(+), 29 deletions(-)
---
diff --git a/app/makefile.msc b/app/makefile.msc
index 5a5c72c..8e3c6c6 100644
--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -3,13 +3,18 @@ PRJ_TOP = ..
 PACKAGE = dia
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
-# -DWIN32 for newer libxml versions
-# not yet 
-PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
-	-DWIN32  -I.. -DGTK_DISABLE_DEPRECATED \
+INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
+	-I. -I$(PRJ_TOP) \
 	$(GLIB_CFLAGS) $(GTK2_CFLAGS) $(LIBXML2_CFLAGS) \
 	-I$(PRJ_TOP)\lib \
 
+# -DWIN32 for newer libxml versions
+DEFINES = \
+	-DHAVE_CONFIG_H \
+	-DWIN32 \
+	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+
 PKG_LINK = $(GTK2_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(PANGOWIN32_LIBS) \
 	$(LIBXML2_LIBS) \
 	$(PRJ_TOP)\lib\libdia.lib $(CAIRO_LIBS) \
@@ -108,8 +113,6 @@ dia-app-icons.h : makefile.msc pixmaps\*.png
 # /subsystem:console and /subsystem:windows have their own exe
 INSTALL = copy
 
-CFLAGS = -I. -I$(PRJ_TOP) -DHAVE_CONFIG_H
-
 ## targets
 all : \
 	$(PRJ_TOP)\config.h \
@@ -146,10 +149,3 @@ $(PACKAGE)-win-remote.exe : dia-win-remote.c dia-win-remote.obj
 
 $(PRJ_TOP)/config.h: $(PRJ_TOP)/config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
-
-.c.obj :
-	$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
-
-.cpp.obj :
-	$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
-
diff --git a/lib/makefile.msc b/lib/makefile.msc
index 2942b60..6a863f7 100644
--- a/lib/makefile.msc
+++ b/lib/makefile.msc
@@ -3,10 +3,6 @@ PRJ_TOP = ..
 PACKAGE = libdia
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
-# don't break on win32 only with it
-#	-DGTK_DISABLE_DEPRECATED \
-
-
 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
 	-I. -I.. \
@@ -168,9 +164,6 @@ font-height.exe : font-height.obj
 	$(CC) $(CFLAGS) -Fe$@ font-height.obj \
 	$(PKG_LINK) $(LDFLAGS) gdi32.lib user32.lib $(LDFLAGS) /subsystem:console
 
-.c.obj :
-	$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
-
 splint :
-	sp -weak $(PKG_CFLAGS) *.c >sp.log
+	sp -weak $(CFLAGS) *.c >sp.log
 	
diff --git a/objects/makefile.msc b/objects/makefile.msc
index cf64853..864cdc5 100644
--- a/objects/makefile.msc
+++ b/objects/makefile.msc
@@ -36,11 +36,17 @@ PKG_DEF = ..\objects.def
 
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
-PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
-	-DGTK_DISABLE_DEPRECATED \
+INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
+	-I. -I$(PRJ_TOP) \
 	$(GLIB_CFLAGS) $(GTK2_CFLAGS) $(INTL_CFLAGS) \
 	$(LIBXML2_CFLAGS) -I$(PRJ_TOP)\lib \
 
+DEFINES = \
+	-DHAVE_CONFIG_H \
+	-DG_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED \
+
 PKG_LINK = $(GLIB_LIBS) $(INTL_LIBS) \
 	$(PRJ_TOP)\lib\libdia.lib \
 	$(CAIRO_LIBS)
@@ -348,9 +354,6 @@ OBJECTS = \
 PKG_LINK = $(PKG_LINK) $(GTK2_LIBS)
 !ENDIF
 
-
-CFLAGS = -I. -I$(PRJ_TOP) -DHAVE_CONFIG_H
-
 $(PACKAGE).lib : $(OBJECTS)
 	lib /out:$(PACKAGE).lib $(OBJECTS)
 
@@ -360,8 +363,5 @@ $(PACKAGE).dll : $(OBJECTS) $(PKG_DEF)
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
 
-.c.obj :
-	$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
-
 !ENDIF