Mercurial > dwindows

diff Makefile.in @ 1351:751f127439f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changes to the build system to no longer use the version during configure. The evaluation of the variables is delayed until during make. This allows the version to be imported from the Version file. Making a new version is as simple as updating the Version file... autoconf and configure no longer need to be run each time.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 15 Nov 2011 14:39:58 +0000
parents 924c8087a755
children 2726b72ec7c4
line wrap: on
line diff
--- a/Makefile.in	Tue Nov 15 13:26:15 2011 +0000
+++ b/Makefile.in	Tue Nov 15 14:39:58 2011 +0000
@@ -3,11 +3,8 @@
 CC	=	@CC@
 PLATCCFLAGS = @PLATCCFLAGS@
 MLFLAGS	=	-L.
-#
-# Uncomment DEPRECATED line to force use of GTK 3.x support
-#
-#DEPRECATED = -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_DISABLE_SINGLE_INCLUDES
-CCFLAGS = $(DEPRECATED) @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES -DVER_REV=$(VER_REV)
+include Version
+CCFLAGS = @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES -DVER_REV=$(VER_REV)
 LFLAGS	=	@LIBS@ @ARCH@
 ARFLAGS = @ARFLAGS@
 INSTALL =	@INSTALL@
@@ -24,8 +21,8 @@
 OBJECTS2=	$(COMPAT_OBJECT)
 TARGET2=	@TARGET2@
 TARGETS = @TARGETS@
-VER_MAJ	=	@DW_MAJOR_VERSION@
-VER_MIN	=	@DW_MINOR_VERSION@
+VER_MAJ	=	$(DW_MAJOR_VERSION)
+VER_MIN	=	$(DW_MINOR_VERSION)
 VER_REV =	@SVNVERSION@
 SOSUFFIX=	@SOSUFFIX@
 SONAME=	@SONAME@