aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Tidy up autotools scripts, removed CFLAGS

Browse Source
This commit is contained in:
James Booth 2012-07-30 00:46:39 +01:00
parent 2375b7ae52
commit 3c0624380a
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -7,12 +7,6 @@ profanity_SOURCES = src/command.c src/contact.c src/history.c src/jabber.h \
src/prof_history.c src/ui.h src/common.h src/ contact_list.h src/jabber.c \
src/main.c src/profanity.h src/prof_history.h src/util.c src/chat_log.c \
src/chat_log.h src/tinyurl.c src/tinyurl.h
profanity_CFLAGS = -O3 -Werror -Wall -Wextra -Wno-unused-parameter \
-Wno-unused-but-set-variable -Wno-unused-result \
-Wno-missing-field-initializers \
-lstrophe -lxml2 -lexpat -lncurses -lcurl \
$(DEPS_CFLAGS) $(DEPS_LIBS) -lresolv \
$(NOTIFY_CFLAGS) $(NOTIFY_LIBS)
TESTS = tests/testsuite
check_PROGRAMS = tests/testsuite

20
configure.ac
View File

@ -40,11 +40,23 @@ PKG_CHECK_MODULES([DEPS], [openssl glib-2.0 libcurl])
PKG_CHECK_MODULES([NOTIFY], [libnotify], [],
[AC_MSG_NOTICE([libnotify module not found])])
CFLAGS="$CFLAGS $DEPS_CFLAGS $DEPS_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS"
CPPFLAGS="$CPPFLAGS $DEPS_CFLAGS $DEPS_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS"
AM_CFLAGS="-O3 -Werror -Wall -Wextra -Wno-unused-parameter "
AM_CFLAGS="$AM_CFLAGS -Wno-unused-but-set-variable -Wno-unused-result "
AM_CFLAGS="$AM_CFLAGS -Wno-missing-field-initializers "
AM_CFLAGS="$AM_CFLAGS -lstrophe -lxml2 -lexpat -lncurses -lcurl -lresolv "
AM_CFLAGS="$AM_CFLAGS $DEPS_CFLAGS $NOFTITY_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
AC_CHECK_HEADERS([libnotify/notify.h], [],
[AC_MSG_NOTICE([libnotify not found, desktop notification option not included])])
AM_CPPFLAGS="-lstrophe -lxml2 -lexpat -lncurses -lcurl -lresolv "
AM_CPPFLAGS="$AM_CPPFLAGS $DEPS_CFLAGS $NOFTITY_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_CPPFLAGS)
#CFLAGS="$CFLAGS $DEPS_CFLAGS $DEPS_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS"
#CPPFLAGS="$CPPFLAGS $DEPS_CFLAGS $DEPS_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS"
#AC_CHECK_HEADERS([libnotify/notify.h], [],
# [AC_MSG_NOTICE([libnotify not found, desktop notification option not included])])
# Checks for typedefs, structures, and compiler characteristics.