Merge tag 'upstream/1.2.0'

[psensor-pkg-debian.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7611095..8779d9e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,23 @@
 SUBDIRS = lib glade
 
+psensor_SOURCES = \
+       cfg.h cfg.c \
+       notify_cmd.c notify_cmd.h \
+       graph.h graph.c \
+       main.c \
+       pxdg.h pxdg.c \
+       rsensor.h \
+       ui.h ui.c \
+       ui_appindicator.h \
+       ui_color.h ui_color.c \
+       ui_graph.h ui_graph.c \
+       ui_notify.h \
+       ui_pref.h ui_pref.c \
+       ui_sensorlist.h ui_sensorlist.c \
+       ui_sensorpref.h ui_sensorpref.c \
+       ui_status.h ui_status.c \
+       ui_unity.h
+
 # -export-dynamic is need for defining handlers in the glade file.
 AM_LDFLAGS = -Wl,--as-needed -export-dynamic
 
@@ -35,28 +53,13 @@ endif
 endif
 endif
 
-psensor_SOURCES = \
-       cfg.h cfg.c \
-       notify_cmd.c notify_cmd.h \
-       graph.h graph.c \
-       main.c \
-       ui.h ui.c \
-       ui_appindicator.h \
-       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 \
-       ui_status.h ui_status.c \
-       pxdg.h pxdg.c
-
 if GTOP
 AM_CPPFLAGS += $(GTOP_CFLAGS)
 LIBS += $(GTOP_LIBS)
 endif
 
 if LIBNOTIFY
-psensor_SOURCES += ui_notify.h ui_notify.c
+psensor_SOURCES += ui_notify.c
 LIBS += $(LIBNOTIFY_LIBS)
 AM_CPPFLAGS += $(LIBNOTIFY_CFLAGS)
 endif
@@ -89,24 +92,32 @@ LIBS += $(LIBUDISKS2_LIBS)
 endif
 
 if UNITY
-psensor_SOURCES += ui_unity.h ui_unity.c
+psensor_SOURCES += ui_unity.c
 AM_CPPFLAGS += $(UNITY_CFLAGS)
 LIBS += $(UNITY_LIBS) 
 endif
 
 if CURL
 if JSON
-psensor_SOURCES += rsensor.h rsensor.c
+psensor_SOURCES += rsensor.c
 LIBS += $(CURL_LIBS) $(JSON_LIBS)
 AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS)
 endif
 endif
 
+if HELP2MAN
 psensor.1: main.c $(top_srcdir)/configure.ac
        $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)
        help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT)
+endif
 
 gsettings_SCHEMAS=psensor.gschema.xml
-EXTRA_DIST = description.txt $(gsettings_SCHEMAS)
+
+EXTRA_DIST = description.txt\
+       $(gsettings_SCHEMAS)\
+       rsensor.c\
+       ui_appindicator.c\
+       ui_notify.c\
+       ui_unity.c
 
 @GSETTINGS_RULES@