ObjFW  Check-in [36464567d2]

Overview
Comment:Adjust objfw-config and objfw-compile to buildsys changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 36464567d2cf0127f6defab8657eded2f6c6c3e54666dfa309cce7fabeb9ee4a
User & Date: js on 2011-10-09 13:05:12
Other Links: manifest | tags
Context
2011-10-11
21:37
Include stdlib.h instead of alloca.h. check-in: adf57d7dbf user: js tags: trunk
2011-10-09
13:05
Adjust objfw-config and objfw-compile to buildsys changes. check-in: 36464567d2 user: js tags: trunk
2011-10-07
11:19
Don't depend on OFMutex in OFFile. check-in: 36434923ad user: js tags: trunk
Changes

Modified utils/objfw-compile from [b75d583b48] to [d1a68f7d66].

227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243

test x"$lib" = x"no" -a x"$plugin" = x"no" && \
	out_suffix="$($OBJFW_CONFIG --prog-suffix)"

test x"$link_stdcpp" = x"yes" && LIBS="$LIBS -lstdc++"

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







|









227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243

test x"$lib" = x"no" -a x"$plugin" = x"no" && \
	out_suffix="$($OBJFW_CONFIG --prog-suffix)"

test x"$link_stdcpp" = x"yes" && LIBS="$LIBS -lstdc++"

if test x"$lib" = x"yes"; then
	export SHARED_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

Modified utils/objfw-config.in from [fdd3ab8e98] to [d7871a7cf4].

97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
					1>&2
				exit 1
			fi

			printf "%s" "$LIB_CFLAGS"
			;;
		--lib-ldflags)
			if test x"$LIB" = x"" -o x"$LIB_MAJOR" = x"" \
			-o x"$LIB_MINOR" = x""; then
				printf "LIB, LIB_MAJOR and LIB_MINOR need " 2>&1
				echo "to be set!" 1>&2
				exit 1
			fi

			printf "%s" "$LIB_LDFLAGS"
			;;
		--lib-prefix)
			if test x"$LIB_MAJOR" = x"" -o x"$LIB_MINOR" = x""; then







|

|
|







97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
					1>&2
				exit 1
			fi

			printf "%s" "$LIB_CFLAGS"
			;;
		--lib-ldflags)
			if test x"$SHARED_LIB" = x"" -o x"$LIB_MAJOR" = x"" \
			-o x"$LIB_MINOR" = x""; then
				printf "SHARED_LIB, LIB_MAJOR and " 2>&1
				echo "and LIB_MINOR to be set!" 1>&2
				exit 1
			fi

			printf "%s" "$LIB_LDFLAGS"
			;;
		--lib-prefix)
			if test x"$LIB_MAJOR" = x"" -o x"$LIB_MINOR" = x""; then