gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move preface.h substitutions

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@7496 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2000-09-13 14:19:43 +00:00
parent 9f18a77807
commit 12fd31ed4a
5 changed files with 45 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-09-13 Adam Fedor <fedor@gnu.org>
* configure.in: Do preface.h substitutions here.
* Source/Makefile.postamble (preface.h): Remove target.
2000-09-12 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSCompatibility.m: new file for MacOSX compatibility flags

12
Headers/gnustep/base/preface.h.in
View file

@ -88,13 +88,11 @@
#endif
/* The following group of lines maintained by the gstep-base src/Makefile */
#define @VERSION@
#define @MAJOR_VERSION@
#define @MINOR_VERSION@
#define @SUBMINOR_VERSION@
#define @GCC_VERSION@
#define @LIBRARY_NAME@
#define @PACKAGE_NAME@
#define GNUSTEP_BASE_VERSION @VERSION@
#define GNUSTEP_BASE_MAJOR_VERSION @MAJOR_VERSION@
#define GNUSTEP_BASE_MINOR_VERSION @MINOR_VERSION@
#define GNUSTEP_BASE_SUBMINOR_VERSION @SUBMINOR_VERSION@
#define GNUSTEP_BASE_GCC_VERSION @GCC_VERSION@
#if 0
extern const char o_version[];

11
Source/Makefile.postamble
View file

@ -134,17 +134,6 @@ dynamic-load.h: ../config.status
rm -f dynamic-load.h
cp $(srcdir)/$(DYNAMIC_LINKER)-load.h dynamic-load.h
Foundation/preface.h: $(srcdir)/Foundation/preface.h.in ../Version
rm -f $@
sed -e "s/@VERSION@/$(LIBRARY_VAR)_VERSION $(VERSION)/" \
< $(srcdir)/Foundation/preface.h.in | \
sed -e "s/@MAJOR_VERSION@/$(LIBRARY_VAR)_MAJOR_VERSION $(MAJOR_VERSION)/" | \
sed -e "s/@MINOR_VERSION@/$(LIBRARY_VAR)_MINOR_VERSION $(MINOR_VERSION)/" | \
sed -e "s/@SUBMINOR_VERSION@/$(LIBRARY_VAR)_SUBMINOR_VERSION $(SUBMINOR_VERSION)/" | \
sed -e "s/@GCC_VERSION@/$(LIBRARY_VAR)_GCC_VERSION $(GCC_VERSION)/" | \
sed -e "s/@LIBRARY_NAME@/$(LIBRARY_VAR)_LIBRARY_NAME $(LIBRARY_NAME)/" | \
sed -e "s/@PACKAGE_NAME@/$(LIBRARY_VAR)_PACKAGE_NAME $(PACKAGE_NAME)/" \
> $@
$(GNUSTEP_OBJ_DIR)/preface${OEXT}: Foundation/preface.h
#

23
configure vendored
View file

@ -4406,6 +4406,18 @@ fi
subdirs="Source/mframe"
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------
if test -f "Version"; then
. Version
fi
#--------------------------------------------------------------------
# Write the Makefiles
#--------------------------------------------------------------------
@ -4509,7 +4521,8 @@ done
ac_given_srcdir=$srcdir
trap 'rm -fr `echo "config.mak Headers/gnustep/base/GSConfig.h Headers/gnustep/base/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
trap 'rm -fr `echo "config.mak Headers/gnustep/base/GSConfig.h
Headers/gnustep/base/preface.h Headers/gnustep/base/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@ -4599,6 +4612,11 @@ s%@HAVE_LIBXML@%$HAVE_LIBXML%g
s%@whole_archive@%$whole_archive%g
s%@no_whole_archive@%$no_whole_archive%g
s%@subdirs@%$subdirs%g
s%@VERSION@%$VERSION%g
s%@MAJOR_VERSION@%$MAJOR_VERSION%g
s%@MINOR_VERSION@%$MINOR_VERSION%g
s%@SUBMINOR_VERSION@%$SUBMINOR_VERSION%g
s%@GCC_VERSION@%$GCC_VERSION%g
CEOF
EOF
@ -4640,7 +4658,8 @@ EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"config.mak Headers/gnustep/base/GSConfig.h"}
CONFIG_FILES=\${CONFIG_FILES-"config.mak Headers/gnustep/base/GSConfig.h
Headers/gnustep/base/preface.h"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

15
configure.in
View file

@ -801,10 +801,23 @@ AC_SUBST(no_whole_archive)
AC_CONFIG_SUBDIRS(Source/mframe)
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------
if test -f "Version"; then
. Version
fi
AC_SUBST(VERSION)
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
AC_SUBST(SUBMINOR_VERSION)
AC_SUBST(GCC_VERSION)
#--------------------------------------------------------------------
# Write the Makefiles
#--------------------------------------------------------------------
AC_OUTPUT(config.mak Headers/gnustep/base/GSConfig.h)
AC_OUTPUT(config.mak Headers/gnustep/base/GSConfig.h
Headers/gnustep/base/preface.h)
dnl Local Variables:
dnl comment-start: "dnl "