blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check return codes in autogen.sh, remove compilation in parent dir for gui dir

Browse Source
This commit is contained in:
Sebastien Helleu 2005-03-20 10:04:51 +00:00
parent 212ca071c6
commit 7fe5afe3cb
6 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autogen.sh
View File

@ -46,10 +46,26 @@ fi
echo "running aclocal..."
aclocal -I /usr/share/aclocal
if [ $? -ne 0 ]; then
echo "ERROR: 'aclocal -I /usr/share/aclocal' failed!"
exit 1
fi
echo "running autoconf..."
autoconf
if [ $? -ne 0 ]; then
echo "ERROR: 'autoconf' failed!"
exit 1
fi
echo "running autoheader..."
autoheader
if [ $? -ne 0 ]; then
echo "ERROR: 'autoheader' failed!"
exit 1
fi
echo "running automake..."
automake -a
if [ $? -ne 0 ]; then
echo "ERROR: 'automake -a' failed!"
exit 1
fi
echo "autogen.sh ok, now run ./configure script"

9
src/gui/Makefile.am
View File

@ -15,6 +15,13 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
noinst_LIBRARIES = lib_weechat_gui_common.a
lib_weechat_gui_common_a_SOURCES = gui-common.c \
gui.h
if GUI_NCURSES
curses_dir=curses
endif
@ -27,4 +34,4 @@ if GUI_QT
qt_dir=qt
endif
SUBDIRS = $(curses_dir) $(gtk_dir) $(qt_dir)
SUBDIRS = . $(curses_dir) $(gtk_dir) $(qt_dir)

7
src/gui/curses/Makefile.am
View File

@ -19,12 +19,11 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = weechat-curses
weechat_curses_LDADD = ../../common/lib_weechat_main.a \
weechat_curses_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \
$(NCURSES_LIBS) \
../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
weechat_curses_SOURCES = ../gui.h \
../gui-common.c \
gui-display.c \
weechat_curses_SOURCES = gui-display.c \
gui-input.c

16
weechat/autogen.sh
View File

@ -46,10 +46,26 @@ fi
echo "running aclocal..."
aclocal -I /usr/share/aclocal
if [ $? -ne 0 ]; then
echo "ERROR: 'aclocal -I /usr/share/aclocal' failed!"
exit 1
fi
echo "running autoconf..."
autoconf
if [ $? -ne 0 ]; then
echo "ERROR: 'autoconf' failed!"
exit 1
fi
echo "running autoheader..."
autoheader
if [ $? -ne 0 ]; then
echo "ERROR: 'autoheader' failed!"
exit 1
fi
echo "running automake..."
automake -a
if [ $? -ne 0 ]; then
echo "ERROR: 'automake -a' failed!"
exit 1
fi
echo "autogen.sh ok, now run ./configure script"

9
weechat/src/gui/Makefile.am
View File

@ -15,6 +15,13 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
noinst_LIBRARIES = lib_weechat_gui_common.a
lib_weechat_gui_common_a_SOURCES = gui-common.c \
gui.h
if GUI_NCURSES
curses_dir=curses
endif
@ -27,4 +34,4 @@ if GUI_QT
qt_dir=qt
endif
SUBDIRS = $(curses_dir) $(gtk_dir) $(qt_dir)
SUBDIRS = . $(curses_dir) $(gtk_dir) $(qt_dir)

7
weechat/src/gui/curses/Makefile.am
View File

@ -19,12 +19,11 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = weechat-curses
weechat_curses_LDADD = ../../common/lib_weechat_main.a \
weechat_curses_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \
$(NCURSES_LIBS) \
../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
weechat_curses_SOURCES = ../gui.h \
../gui-common.c \
gui-display.c \
weechat_curses_SOURCES = gui-display.c \
gui-input.c