Mercurial > dwindows
diff configure.in @ 1351:751f127439f7
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 | c993df7ffdd8 |
| children | 6baf177f335c |
line wrap: on
line diff
--- a/configure.in Tue Nov 15 13:26:15 2011 +0000 +++ b/configure.in Tue Nov 15 14:39:58 2011 +0000 @@ -1,10 +1,6 @@ AC_INIT(winmain.c) AC_CONFIG_HEADER(config.h) -DW_MAJOR_VERSION=2 -DW_MINOR_VERSION=1 -DW_SUB_VERSION=0 - TARGET="dwindows" TARGET2="dwcompat" AC_SUBST(TARGET) @@ -19,9 +15,6 @@ SOSUFFIX=so LIBSUFFIX=a LIBPREFIX=lib -AC_SUBST(DW_MAJOR_VERSION) -AC_SUBST(DW_MINOR_VERSION) -AC_SUBST(DW_SUB_VERSION) INCLUDES="-I." @@ -66,13 +59,13 @@ if test $with_compat = yes; then COMPAT_OBJECT="compat.o" INSTALL_COMPAT="installcompat" - SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION" + SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" else COMPAT_OBJECT="" INSTALL_COMPAT="" SYSCONF_LINK_TARGET_SHARED2="" fi -SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION" +SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" dnl ---------------------- check for '--with-gtk+' switch ----------------- @@ -153,7 +146,7 @@ AC_DEFINE(DW_USE_GTK) ;; *linux*) - SONAME="-Wl,-soname,lib$TARGET.so.$DW_MAJOR_VERSION" + SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)" ;; *nto-qnx*) DW_DIR="photon"