Check-in [bdb920afdb]
Overview
Comment:Corrected issue introduced in [d56c4a3049f6555b] where projects where always attempted to be linked against if they were attempted to be compiled (but failed)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: bdb920afdbfe5455cd320ad33b3f2e054f40a89c
User & Date: rkeene on 2014-05-19 04:18:59
Other Links: manifest | tags
Context
2014-05-19
04:19
Removed extraneous debugging information in last commit check-in: c401b28269 user: rkeene tags: trunk
04:18
Corrected issue introduced in [d56c4a3049f6555b] where projects where always attempted to be linked against if they were attempted to be compiled (but failed) check-in: bdb920afdb user: rkeene tags: trunk
03:53
Corrected path check-in: a292122a04 user: rkeene tags: trunk
Changes

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [a86a7a549c] to [bfe7cbbaec].

197
198
199
200
201
202
203




204
205
206
207
208
209
210
			projexclude="`cat "$projexcludefile"`"
			projlibfiles="`echo "$projlibfiles" | egrep -v "$projexclude"`"
		fi

		projlibfilesnostub="`echo "$projlibfiles" | grep -v 'stub' | tr "\n" ' '`"
		projlibfiles="`echo "$projlibfiles" | tr "\n" ' '`"
		projlibextra=""





		for libfile in ${projlibfilesnostub}; do
			if test -f "${libfile}.linkadd"; then
				projlibextra="`cat "${libfile}.linkadd"`"
			fi
		done








>
>
>
>







197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
			projexclude="`cat "$projexcludefile"`"
			projlibfiles="`echo "$projlibfiles" | egrep -v "$projexclude"`"
		fi

		projlibfilesnostub="`echo "$projlibfiles" | grep -v 'stub' | tr "\n" ' '`"
		projlibfiles="`echo "$projlibfiles" | tr "\n" ' '`"
		projlibextra=""

		if test "$projlibfilesnostub" = ' '; then
			projlibfilesnostub=''
		fi

		for libfile in ${projlibfilesnostub}; do
			if test -f "${libfile}.linkadd"; then
				projlibextra="`cat "${libfile}.linkadd"`"
			fi
		done

273
274
275
276
277
278
279

280
281
282
283
284
285
286
		fi

		dnl Do not explicitly link to Zlib, that will happen elsewhere
		if test "${proj}" = "zlib"; then
			continue
		fi


		if test -n "${subprojs}"; then
			if test -n "${projlibfilesnostub}"; then
				for subproj in $subprojs; do
					subprojucase="`echo ${subproj} | dd conv=ucase 2>/dev/null`"
					subprojtcase="`echo ${subprojucase} | cut -c 1``echo ${subproj} | cut -c 2-`"
					lib_init_func="${subprojtcase}_Init"








>







277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
		fi

		dnl Do not explicitly link to Zlib, that will happen elsewhere
		if test "${proj}" = "zlib"; then
			continue
		fi

echo "***: proj=$proj; subprojs=$subprojs; projlibfilesnostub=\"$projlibfilesnostub\""
		if test -n "${subprojs}"; then
			if test -n "${projlibfilesnostub}"; then
				for subproj in $subprojs; do
					subprojucase="`echo ${subproj} | dd conv=ucase 2>/dev/null`"
					subprojtcase="`echo ${subprojucase} | cut -c 1``echo ${subproj} | cut -c 2-`"
					lib_init_func="${subprojtcase}_Init"