ObjFW  Check-in [0320eee453]

Overview
Comment:Prevent entering directories twice.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 0320eee4538957395fc6baf37fc4668ffcca08ec6d593e6f1a19595fed47b2a5
User & Date: js on 2013-12-10 17:26:55
Other Links: manifest | tags
Context
2013-12-11
22:19
+[copyFileAtPath:toPath:]: Never override items. check-in: ba57490ba6 user: js tags: trunk
2013-12-10
17:26
Prevent entering directories twice. check-in: 0320eee453 user: js tags: trunk
16:21
OFZIP: Add dependency on libobjfw.a if necessary. check-in: 082d1f50c5 user: js tags: trunk
Changes

Modified buildsys.mk.in from [bae2b43312] to [3793217eb4].

108
109
110
111
112
113
114

115
116
117



118
119
120
121
122
123
124

.SILENT:
.SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}

all:

	${MAKE} ${MFLAGS} subdirs
	${MAKE} ${MFLAGS} depend
	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales




subdirs: ${SUBDIRS}

${SUBDIRS}:
	for i in $@; do \
		${DIR_ENTER}; \
		${MAKE} ${MFLAGS} || exit $$?; \







>



>
>
>







108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128

.SILENT:
.SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}

all:
	${MAKE} pre-all
	${MAKE} ${MFLAGS} subdirs
	${MAKE} ${MFLAGS} depend
	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
	${MAKE} post-all

pre-all post-all:

subdirs: ${SUBDIRS}

${SUBDIRS}:
	for i in $@; do \
		${DIR_ENTER}; \
		${MAKE} ${MFLAGS} || exit $$?; \

Modified src/Makefile from [f50db72e20] to [d7d007a7b2].

1
2
3
4
5
6
7
8
9
10
include ../extra.mk

SUBDIRS = ${RUNTIME} exceptions ${BRIDGE} forwarding

SHARED_LIB = ${OBJFW_SHARED_LIB}
STATIC_LIB = ${OBJFW_STATIC_LIB}
LIB_MAJOR = ${OBJFW_LIB_MAJOR}
LIB_MINOR = ${OBJFW_LIB_MINOR}

SRCS = OFApplication.m			\


|







1
2
3
4
5
6
7
8
9
10
include ../extra.mk

SUBDIRS = ${RUNTIME} exceptions forwarding

SHARED_LIB = ${OBJFW_SHARED_LIB}
STATIC_LIB = ${OBJFW_STATIC_LIB}
LIB_MAJOR = ${OBJFW_LIB_MAJOR}
LIB_MINOR = ${OBJFW_LIB_MINOR}

SRCS = OFApplication.m			\
133
134
135
136
137
138
139









140
141
142
143
144
145
146
147
148
	     ${EXCEPTIONS_EXCEPTIONS_A} \
	     ${FORWARDING_FORWARDING_A}
LIB_OBJS_EXTRA = ${RUNTIME_RUNTIME_LIB_A}	\
		 ${EXCEPTIONS_EXCEPTIONS_LIB_A}	\
		 ${FORWARDING_FORWARDING_LIB_A}

include ../buildsys.mk










CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
LD = ${OBJC}
LDFLAGS += ${REEXPORT_LIBOBJC}

${RUNTIME_RUNTIME_A} ${RUNTIME_RUNTIME_LIB_A}: ${RUNTIME}
${EXCEPTIONS_EXCEPTIONS_A} ${EXCEPTIONS_EXCEPTIONS_LIB_A}: exceptions
${FORWARDING_FORWARDING_A} ${FORWARDING_FORWARDING_LIB_A}: forwarding
${BRIDGE}: ${SHARED_LIB}







>
>
>
>
>
>
>
>
>




<
<
<
<
<
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152





	     ${EXCEPTIONS_EXCEPTIONS_A} \
	     ${FORWARDING_FORWARDING_A}
LIB_OBJS_EXTRA = ${RUNTIME_RUNTIME_LIB_A}	\
		 ${EXCEPTIONS_EXCEPTIONS_LIB_A}	\
		 ${FORWARDING_FORWARDING_LIB_A}

include ../buildsys.mk

post-all: ${BRIDGE}

${BRIDGE}: ${SHARED_LIB}
	for i in $@; do \
		${DIR_ENTER}; \
		${MAKE} ${MFLAGS} || exit $$?; \
		${DIR_LEAVE}; \
	done

CPPFLAGS += -I. -I.. -Iexceptions -Iruntime
LD = ${OBJC}
LDFLAGS += ${REEXPORT_LIBOBJC}