Check-in [cacf7999db]
Overview
Comment:Updated to find libraries to link to dynamically

Updated to add "unix" directory to header search path

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: cacf7999db512d03d7d9bfa8c63a136d35ebda2b
User & Date: rkeene on 2010-09-26 04:38:10
Other Links: manifest | tags
Context
2010-09-26
04:38
Updated to clean before building, for sanity during development (releases shouldn't need this) check-in: a9dca07df3 user: rkeene tags: trunk
04:38
Updated to find libraries to link to dynamically

Updated to add "unix" directory to header search path check-in: cacf7999db user: rkeene tags: trunk

04:38
KitCreator 0.0.3.x

Updated to cleanup build info check-in: 8670f53dbc user: rkeene tags: trunk, 0.0.3

Changes

Modified kitsh/buildsrc/kitsh-0.0/Makefile.in from [9c5abd59ed] to [06f1b2f40d].

1
2
3
4
5

6
7
8
9
10
11
12
13
14
CC = @CC@
CFLAGS = -Wall @CFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@

OBJS = kitInit.o main.o pwb.o rechan.o zlib.o
ARCHS = ../../../mk4tcl/inst/lib/Mk4tcl/Mk4tcl.a ../../../tcl/inst/lib/libtcl8.4.a ../../../tclvfs/inst/lib/vfs1.3/libvfs1.3.a

all: kit

kit: $(OBJS) $(ARCHS)
	$(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(ARCHS) $(LDFLAGS) $(LIBS)

clean:





>

<







1
2
3
4
5
6
7

8
9
10
11
12
13
14
CC = @CC@
CFLAGS = -Wall @CFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
ARCHS = @ARCHS@
OBJS = kitInit.o main.o pwb.o rechan.o zlib.o


all: kit

kit: $(OBJS) $(ARCHS)
	$(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(ARCHS) $(LDFLAGS) $(LIBS)

clean:

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [03a71efe74] to [c2b5bbda30].

22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
	else
		tclconfigsh="${with_tcl}/tclConfig.sh"
	fi

	if test -f "${tclconfigsh}"; then
		source "${tclconfigsh}"

		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic"
		LDFLAGS="${LDFLAGS}"
		LIBS="${LIBS} ${TCL_LIBS}"
	fi

	AC_SUBST(CFLAGS)
	AC_SUBST(CPPFLAGS)
	AC_SUBST(LDFLAGS)







|
|







22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
	else
		tclconfigsh="${with_tcl}/tclConfig.sh"
	fi

	if test -f "${tclconfigsh}"; then
		source "${tclconfigsh}"

		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix"
		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix"
		LDFLAGS="${LDFLAGS}"
		LIBS="${LIBS} ${TCL_LIBS}"
	fi

	AC_SUBST(CFLAGS)
	AC_SUBST(CPPFLAGS)
	AC_SUBST(LDFLAGS)
46
47
48
49
50
51
52















	STATICLIBCXX="-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic"
	LIBS="${LIBS} ${STATICLIBCXX}"

	AC_SUBST(LIBS)

	AC_MSG_RESULT([${STATICLIBCXX}])
])






















>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
	STATICLIBCXX="-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic"
	LIBS="${LIBS} ${STATICLIBCXX}"

	AC_SUBST(LIBS)

	AC_MSG_RESULT([${STATICLIBCXX}])
])

AC_DEFUN(DC_FIND_TCLKIT_LIBS, [
	for proj in mk4tcl tcl tclvfs; do
		AC_MSG_CHECKING([for libraries required for ${proj}])

		libdir="../../../${proj}/inst"
		libfiles="`find "${libdir}" -name '*.a' | tr "\n" ' '`"

		ARCHS="${ARCHS} ${libfiles}"

		AC_MSG_RESULT([${libfiles}])
	done

	AC_SUBST(ARCHS)
])

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [d1ba583817] to [ea43bce0fb].

10
11
12
13
14
15
16



17
18
19
20
21
22
23
24
AC_GNU_SOURCE

dnl Find the appropriate Tcl headers and libraries
DC_DO_TCL

dnl Find out how to statically link to libstdc++ (for Metakit)
DC_DO_STATIC_LINK_LIBCXX




dnl Find the appropriate libraries to link to
AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])

dnl Produce output
AC_OUTPUT(Makefile)







>
>
>








10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
AC_GNU_SOURCE

dnl Find the appropriate Tcl headers and libraries
DC_DO_TCL

dnl Find out how to statically link to libstdc++ (for Metakit)
DC_DO_STATIC_LINK_LIBCXX

dnl Find archives we need to link to
DC_FIND_TCLKIT_LIBS

dnl Find the appropriate libraries to link to
AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])

dnl Produce output
AC_OUTPUT(Makefile)