pedantic mode for top dir src

diff --git a/src/Makefile.am b/src/Makefile.am
index a165593..bde5a54 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,18 +12,13 @@ SUBDIRS += server
 endif
 endif
 
-AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
+AM_CPPFLAGS = -Wall -pedantic -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/unity \
        $(GTK_CFLAGS)\
        $(GCONF_CFLAGS)\
        $(SENSORS_CFLAGS)
 
-if LIBATIADL
-else
-AM_CPPFLAGS += -pedantic 
-endif
-
 DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 LIBS = \

diff --git a/src/Makefile.in b/src/Makefile.in
index 30a577d..c975416 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -36,21 +36,20 @@ build_triplet = @build@
 host_triplet = @host@
 @JSON_TRUE@am__append_1 = libpsensor_json
 @JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_2 = server
-@LIBATIADL_FALSE@am__append_3 = -pedantic 
 bin_PROGRAMS = psensor$(EXEEXT)
-@LIBNOTIFY_TRUE@am__append_4 = ui_notify.h ui_notify.c
-@LIBNOTIFY_TRUE@am__append_5 = $(LIBNOTIFY_LIBS)
-@LIBNOTIFY_TRUE@am__append_6 = $(LIBNOTIFY_CFLAGS)
-@APPINDICATOR_TRUE@am__append_7 = ui_appindicator.h ui_appindicator.c 
-@APPINDICATOR_TRUE@am__append_8 = $(APPINDICATOR_LIBS)
-@APPINDICATOR_TRUE@am__append_9 = $(APPINDICATOR_CFLAGS)
-@NVIDIA_TRUE@am__append_10 = $(NVIDIA_CFLAGS)
-@NVIDIA_TRUE@am__append_11 = $(NVIDIA_LIBS)
-@UNITY_TRUE@am__append_12 = $(UNITY_CFLAGS)
-@UNITY_TRUE@am__append_13 = unity/libpsensor_unity.a $(UNITY_LIBS) 
-@CURL_TRUE@@JSON_TRUE@am__append_14 = rsensor.h rsensor.c plib/url.c plib/url.h
-@CURL_TRUE@@JSON_TRUE@am__append_15 = $(CURL_LIBS) $(JSON_LIBS)
-@CURL_TRUE@@JSON_TRUE@am__append_16 = $(CURL_CFLAGS) $(JSON_CFLAGS)
+@LIBNOTIFY_TRUE@am__append_3 = ui_notify.h ui_notify.c
+@LIBNOTIFY_TRUE@am__append_4 = $(LIBNOTIFY_LIBS)
+@LIBNOTIFY_TRUE@am__append_5 = $(LIBNOTIFY_CFLAGS)
+@APPINDICATOR_TRUE@am__append_6 = ui_appindicator.h ui_appindicator.c 
+@APPINDICATOR_TRUE@am__append_7 = $(APPINDICATOR_LIBS)
+@APPINDICATOR_TRUE@am__append_8 = $(APPINDICATOR_CFLAGS)
+@NVIDIA_TRUE@am__append_9 = $(NVIDIA_CFLAGS)
+@NVIDIA_TRUE@am__append_10 = $(NVIDIA_LIBS)
+@UNITY_TRUE@am__append_11 = $(UNITY_CFLAGS)
+@UNITY_TRUE@am__append_12 = unity/libpsensor_unity.a $(UNITY_LIBS) 
+@CURL_TRUE@@JSON_TRUE@am__append_13 = rsensor.h rsensor.c plib/url.c plib/url.h
+@CURL_TRUE@@JSON_TRUE@am__append_14 = $(CURL_LIBS) $(JSON_LIBS)
+@CURL_TRUE@@JSON_TRUE@am__append_15 = $(CURL_CFLAGS) $(JSON_CFLAGS)
 subdir = src
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
@@ -209,8 +208,8 @@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = plib/libplib.a lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) \
-       $(SENSORS_LIBS) $(am__append_5) $(am__append_8) \
-       $(am__append_11) $(am__append_13) $(am__append_15)
+       $(SENSORS_LIBS) $(am__append_4) $(am__append_7) \
+       $(am__append_10) $(am__append_12) $(am__append_14)
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -303,16 +302,17 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = plib lib unity glade $(am__append_1) $(am__append_2)
 AM_LDFLAGS = -Wl,--as-needed 
-AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
+AM_CPPFLAGS = -Wall -pedantic -Werror \
+       -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
        -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \
        $(GTK_CFLAGS) $(GCONF_CFLAGS) $(SENSORS_CFLAGS) \
-       $(am__append_3) $(am__append_6) $(am__append_9) \
-       $(am__append_10) $(am__append_12) $(am__append_16)
+       $(am__append_5) $(am__append_8) $(am__append_9) \
+       $(am__append_11) $(am__append_15)
 psensor_SOURCES = compat.h cfg.h cfg.c graph.h graph.c main.c ui.h \
        ui.c ui_color.h ui_color.c ui_graph.h ui_graph.c ui_pref.h \
        ui_pref.c ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
-       ui_sensorpref.c $(am__append_4) $(am__append_7) \
-       $(am__append_14)
+       ui_sensorpref.c $(am__append_3) $(am__append_6) \
+       $(am__append_13)
 dist_man_MANS = psensor.1
 EXTRA_DIST = description.txt
 all: all-recursive