Overview
| Comment: | Split makefile.inc into 2 pieces to try and make makefile better |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.66-ubuntu |
| Files: | files | file ages | folders |
| SHA1: |
7f1e84d10d19cd8fa9a639fd60c5102a |
| User & Date: | jmoon18 on 2020-05-22 16:42:30 |
| Other Links: | branch diff | manifest | tags |
Context
|
2020-05-22
| ||
| 17:16 | Moved makefile inc after prefix so it overrides check-in: 39ec01ec3b user: jmoon18 tags: v1.66-ubuntu | |
| 16:42 | Split makefile.inc into 2 pieces to try and make makefile better check-in: 7f1e84d10d user: jmoon18 tags: v1.66-ubuntu | |
| 15:53 | Moved inc further up in Makefile to try and get prefix working properly check-in: 7f08010842 user: jmoon18 tags: v1.66-ubuntu | |
Changes
Modified Makefile from [fc77072c20] to [f10cf8d623].
| ︙ | ︙ | |||
81 82 83 84 85 86 87 88 89 90 91 92 93 94 | csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) $(MOIMPFILES) -o dboard ndboard : newdashboard.scm $(OFILES) $(GOFILES) csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut TCMTOBJS = \ api.o \ archive.o \ cgisetup/models/pgdb.o \ client.o \ common.o \ | > > | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) $(MOIMPFILES) -o dboard ndboard : newdashboard.scm $(OFILES) $(GOFILES) csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut include makefile2.inc TCMTOBJS = \ api.o \ archive.o \ cgisetup/models/pgdb.o \ client.o \ common.o \ |
| ︙ | ︙ |
Modified configure from [89ab4457ae] to [7847ebe614].
| ︙ | ︙ | |||
100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 |
}
#======================================================================
# Initialize makefile.inc
#======================================================================
echo "" > makefile.inc
#======================================================================
# Do we need Chicken?
#======================================================================
CHICKEN_PREFIX=$PREFIX/bin/.$ARCHSTR
echo "CHICKEN_PREFIX=$CHICKEN_PREFIX" >> makefile.inc
echo "PREFIX=$PREFIX" >> makefile.inc
echo "ARCHSTR=$ARCHSTR" >> makefile.inc
echo "IUPARCH=$IUPARCH" >> makefile.inc
echo "CDVER=$CDVER" >> makefile.inc
echo "IMVER=$IMVER" >> makefile.inc
echo "IUPVER=$IUPVER" >> makefile.inc
echo "IUPEGGVER=$IUPEGGVER" >> makefile.inc
if [[ ! $(type csi) ]];then
echo "Chicken build needed."
echo "BUILD_CHICKEN=yes" >> makefile.inc
configure_dependencies
| > | | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 |
}
#======================================================================
# Initialize makefile.inc
#======================================================================
echo "" > makefile.inc
echo "" > makefile2.inc
#======================================================================
# Do we need Chicken?
#======================================================================
CHICKEN_PREFIX=$PREFIX/bin/.$ARCHSTR
echo "CHICKEN_PREFIX=$CHICKEN_PREFIX" >> makefile.inc
echo "PREFIX=$PREFIX" >> makefile.inc
echo "ARCHSTR=$ARCHSTR" >> makefile.inc
echo "IUPARCH=$IUPARCH" >> makefile.inc
echo "CDVER=$CDVER" >> makefile.inc
echo "IMVER=$IMVER" >> makefile.inc
echo "IUPVER=$IUPVER" >> makefile.inc
echo "IUPEGGVER=$IUPEGGVER" >> makefile.inc
if [[ ! $(type csi) ]];then
echo "Chicken build needed."
echo "BUILD_CHICKEN=yes" >> makefile.inc
configure_dependencies
echo "include chicken.makefile" >> makefile2.inc
else
echo "CSIPATH=$(which csi)" >> makefile.inc
echo "CKPATH=$(dirname $(dirname $CSIPATH))" >> makefile.inc
fi
# Make setup scripts
echo "#!/bin/bash" > setup.sh
|
| ︙ | ︙ |