Skip to content

Commit

Permalink
make now stops at error on compilation, delete invalid error message …
Browse files Browse the repository at this point in the history
…on socket
  • Loading branch information
LeeAkinobu committed Dec 14, 2015
1 parent a301e82 commit 68aaa1c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 21 deletions.
36 changes: 16 additions & 20 deletions Makefile.in
Expand Up @@ -18,36 +18,25 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
INSTALL=@INSTALL@

all:
for d in $(SUBDIRS); do \
(cd $$d; $(MAKE)); \
done
.PHONY: all install install.bin install.man clean distclean configure doxygen

install:
for d in $(SUBDIRS); do \
(cd $$d; $(MAKE) install); \
done
all install install.bin clean distclean: $(SUBDIRS)

install.bin:
for d in $(SUBDIRS); do \
(cd $$d; $(MAKE) install.bin); \
done
all: TARGET=all

install: TARGET=install

install.bin: TARGET=install.bin

install.man:
(cd man; $(MAKE) install)

clean: TARGET=clean
clean:
for d in $(SUBDIRS); do \
(cd $$d; $(MAKE) clean); \
done
$(RM) config.log config.cache

distclean: TARGET=distclean
distclean:
for d in $(SUBDIRS); do \
if test -f $$d/Makefile; then \
(cd $$d; $(MAKE) distclean); \
fi; \
done
$(RM) config.log config.cache
$(RM) config.status
$(RM) Makefile
Expand All @@ -64,3 +53,10 @@ doxygen:
cat support/doxygen.conf.ja libjulius/doxygen.conf.ver > doxygen/doxygen.conf.ja
doxygen doxygen/doxygen.conf.en > doxygen/doxygen-en.log 2> doxygen/doxygen-en-err.log
doxygen doxygen/doxygen.conf.ja > doxygen/doxygen-ja.log 2> doxygen/doxygen-ja-err.log

$(SUBDIRS): force
@ test -f $@/Makefile && $(MAKE) -C $@ $(TARGET)

.PHONY: force

force :;
1 change: 1 addition & 0 deletions jclient-perl/Makefile.in
Expand Up @@ -24,4 +24,5 @@ clean:
echo nothing to do

distclean:
chmod -x $(TARGET)
$(RM) Makefile
2 changes: 1 addition & 1 deletion libsent/src/net/rdwt.c
Expand Up @@ -55,7 +55,7 @@ rd(int fd, char *data, int *len, int maxlen)
read(fd,((char *)len) + off, toread);
#endif
if (ret <= 0) {
if (ret < 0) jlog("Error: rdwt: failed to read data at %d / %d\n", count, len);
if (ret < 0) jlog("Error: rdwt: failed to read data\n");
return(-1);
}
toread -= ret;
Expand Down

0 comments on commit 68aaa1c

Please sign in to comment.