ObjFW  Check-in [ca9a6f1593]

Overview
Comment:Remove variables $ENV_{CFLAGS,LIBS,LDFLAGS} in objfw-compile.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ca9a6f1593991f509678e6e13ae82ab436b9fb49a852d65ac940384f6c607f31
User & Date: js on 2011-01-21 01:23:11
Other Links: manifest | tags
Context
2011-01-22
23:35
Don't send two packets in -[OFStream writeLine:]. check-in: d2b0beab38 user: js tags: trunk
2011-01-21
01:23
Remove variables $ENV_{CFLAGS,LIBS,LDFLAGS} in objfw-compile. check-in: ca9a6f1593 user: js tags: trunk
2011-01-18
20:58
Add +[thread] to OFThread and allow -[init]. check-in: bdfcb94f18 user: js tags: trunk
Changes

Modified utils/objfw-compile from [0f18b21798] to [2d1b114a41].

180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
	elif test x"$plugin" = x"yes"; then
		obj="${i%.m}.plugin.o"
	else
		obj="${i%.m}.o"
	fi
	objs="$objs $obj"
	build="no"
	deps=$($OBJC -E -M $CPPFLAGS $ENV_CPPFLAGS $i | \
	       sed 's/.*: //' | sed 's/\\//g')

	if test -f "$obj"; then
		for dep in $deps; do
			test "$dep" -nt $obj && build="yes"
		done
	else
		build="yes"







|
<







180
181
182
183
184
185
186
187

188
189
190
191
192
193
194
	elif test x"$plugin" = x"yes"; then
		obj="${i%.m}.plugin.o"
	else
		obj="${i%.m}.o"
	fi
	objs="$objs $obj"
	build="no"
	deps=$($OBJC -E -M $CPPFLAGS $i | sed 's/.*: //' | sed 's/\\//g')


	if test -f "$obj"; then
		for dep in $deps; do
			test "$dep" -nt $obj && build="yes"
		done
	else
		build="yes"
210
211
212
213
214
215
216
217
218
219
220
if test x"$lib" = x"yes"; then
	export LIB="$out_prefix$out$out_suffix"
	LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --lib-ldflags)"
fi

if test ! -f "$out_prefix$out$out_suffix" -o x"$link" = x"yes"; then
	status_linking $out_prefix$out$out_suffix
	$OBJC -o $out_prefix$out$out_suffix $objs $LIBS $ENV_LIBS $LDFLAGS \
		$ENV_LDFLAGS || status_link_failed $out $?
	status_linked $out_prefix$out$out_suffix
fi







|
|


209
210
211
212
213
214
215
216
217
218
219
if test x"$lib" = x"yes"; then
	export LIB="$out_prefix$out$out_suffix"
	LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --lib-ldflags)"
fi

if test ! -f "$out_prefix$out$out_suffix" -o x"$link" = x"yes"; then
	status_linking $out_prefix$out$out_suffix
	$OBJC -o $out_prefix$out$out_suffix $objs $LIBS $LDFLAGS || \
		status_link_failed $out $?
	status_linked $out_prefix$out$out_suffix
fi