X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Flib%2FMakefile.in;h=7f292935b09bbb58960313fded7474254ff968cc;hp=8ba10d12eb5414b2c12a45c3c0c1567aa13b5ecc;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=8a3d16ade26321374c684080d627cf12ba71e598

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 8ba10d1..7f29293 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,30 +88,30 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ATASMART_TRUE@am__append_1 = hdd_atasmart.c
-@ATASMART_TRUE@am__append_2 = $(ATASMART_LIBS)
-@ATASMART_TRUE@am__append_3 = $(ATASMART_CFLAGS)
-@NVIDIA_TRUE@am__append_4 = nvidia.c
-@LIBATIADL_TRUE@am__append_5 = $(LIBATIADL_LIBS)
-@LIBATIADL_TRUE@am__append_6 = $(LIBATIADL_CFLAGS)
-@LIBATIADL_TRUE@am__append_7 = amd.c
-@GTOP_TRUE@am__append_8 = cpu.c pmem.c pmem.h
-@GTOP_TRUE@am__append_9 = $(GTOP_LIBS)
-@GTOP_TRUE@am__append_10 = $(GTOP_CFLAGS)
-@JSON_TRUE@am__append_11 = psensor_json.h psensor_json.c
-@JSON_TRUE@am__append_12 = $(JSON_LIBS)
-@JSON_TRUE@am__append_13 = $(JSON_CFLAGS)
+@SENSORS_TRUE@am__append_1 = lmsensor.c
+@SENSORS_TRUE@am__append_2 = $(SENSORS_LIBS)
+@ATASMART_TRUE@am__append_3 = hdd_atasmart.c
+@ATASMART_TRUE@am__append_4 = $(ATASMART_LIBS)
+@ATASMART_TRUE@am__append_5 = $(ATASMART_CFLAGS)
+@NVIDIA_TRUE@am__append_6 = nvidia.c
+@LIBATIADL_TRUE@am__append_7 = $(LIBATIADL_LIBS)
+@LIBATIADL_TRUE@am__append_8 = $(LIBATIADL_CFLAGS)
+@LIBATIADL_TRUE@am__append_9 = amd.c
+@GTOP_TRUE@am__append_10 = pgtop2.c
+@GTOP_TRUE@am__append_11 = $(GTOP_LIBS)
+@GTOP_TRUE@am__append_12 = $(GTOP_CFLAGS)
+@JSON_TRUE@am__append_13 = psensor_json.h psensor_json.c
+@JSON_TRUE@am__append_14 = $(JSON_LIBS)
+@JSON_TRUE@am__append_15 = $(JSON_CFLAGS)
+@LIBUDISKS2_TRUE@am__append_16 = pudisks2.c
+@LIBUDISKS2_TRUE@am__append_17 = $(LIBUDISKS2_LIBS)
+@LIBUDISKS2_TRUE@am__append_18 = $(LIBUDISKS2_CFLAGS)
 subdir = src/lib
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -114,23 +124,26 @@ am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 libpsensor_a_AR = $(AR) $(ARFLAGS)
 libpsensor_a_LIBADD =
-am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c cpu.h \
-	hdd.h hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \
-	nvidia.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
-	ptime.h ptime.c pio.h pio.c slog.c slog.h temperature.c \
-	temperature.h url.c url.h hdd_atasmart.c nvidia.c amd.c cpu.c \
-	pmem.c pmem.h psensor_json.h psensor_json.c
-@ATASMART_TRUE@am__objects_1 = hdd_atasmart.$(OBJEXT)
-@NVIDIA_TRUE@am__objects_2 = nvidia.$(OBJEXT)
-@LIBATIADL_TRUE@am__objects_3 = amd.$(OBJEXT)
-@GTOP_TRUE@am__objects_4 = cpu.$(OBJEXT) pmem.$(OBJEXT)
-@JSON_TRUE@am__objects_5 = psensor_json.$(OBJEXT)
+am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c hdd.h \
+	hdd_hddtemp.c lmsensor.h measure.h measure.c nvidia.h parray.h \
+	pgtop2.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
+	ptime.h ptime.c pio.h pio.c pudisks2.h slog.c slog.h \
+	temperature.c temperature.h url.c url.h lmsensor.c \
+	hdd_atasmart.c nvidia.c amd.c pgtop2.c psensor_json.h \
+	psensor_json.c pudisks2.c
+@SENSORS_TRUE@am__objects_1 = lmsensor.$(OBJEXT)
+@ATASMART_TRUE@am__objects_2 = hdd_atasmart.$(OBJEXT)
+@NVIDIA_TRUE@am__objects_3 = nvidia.$(OBJEXT)
+@LIBATIADL_TRUE@am__objects_4 = amd.$(OBJEXT)
+@GTOP_TRUE@am__objects_5 = pgtop2.$(OBJEXT)
+@JSON_TRUE@am__objects_6 = psensor_json.$(OBJEXT)
+@LIBUDISKS2_TRUE@am__objects_7 = pudisks2.$(OBJEXT)
 am_libpsensor_a_OBJECTS = color.$(OBJEXT) hdd_hddtemp.$(OBJEXT) \
-	lmsensor.$(OBJEXT) measure.$(OBJEXT) plog.$(OBJEXT) \
-	pmutex.$(OBJEXT) psensor.$(OBJEXT) ptime.$(OBJEXT) \
-	pio.$(OBJEXT) slog.$(OBJEXT) temperature.$(OBJEXT) \
-	url.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3) $(am__objects_4) $(am__objects_5)
+	measure.$(OBJEXT) plog.$(OBJEXT) pmutex.$(OBJEXT) \
+	psensor.$(OBJEXT) ptime.$(OBJEXT) pio.$(OBJEXT) slog.$(OBJEXT) \
+	temperature.$(OBJEXT) url.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
+	$(am__objects_5) $(am__objects_6) $(am__objects_7)
 libpsensor_a_OBJECTS = $(am_libpsensor_a_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -186,6 +199,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -215,6 +229,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
@@ -245,8 +260,10 @@ LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@
 LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@ $(am__append_2) $(am__append_5) $(am__append_9) \
-	$(am__append_12)
+LIBS = @LIBS@ $(am__append_2) $(am__append_4) $(am__append_7) \
+	$(am__append_11) $(am__append_14) $(am__append_17)
+LIBUDISKS2_CFLAGS = @LIBUDISKS2_CFLAGS@
+LIBUDISKS2_LIBS = @LIBUDISKS2_LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -272,6 +289,7 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
+SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -286,6 +304,7 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -331,6 +350,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -340,19 +360,22 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libpsensor.a
-libpsensor_a_SOURCES = amd.h bool.h color.h color.c cpu.h hdd.h \
-	hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \
-	nvidia.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
-	ptime.h ptime.c pio.h pio.c slog.c slog.h temperature.c \
-	temperature.h url.c url.h $(am__append_1) $(am__append_4) \
-	$(am__append_7) $(am__append_8) $(am__append_11)
-AM_CPPFLAGS = -Wall -Werror $(am__append_3) $(am__append_6) \
-	$(am__append_10) $(am__append_13)
+libpsensor_a_SOURCES = amd.h bool.h color.h color.c hdd.h \
+	hdd_hddtemp.c lmsensor.h measure.h measure.c nvidia.h parray.h \
+	pgtop2.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
+	ptime.h ptime.c pio.h pio.c pudisks2.h slog.c slog.h \
+	temperature.c temperature.h url.c url.h $(am__append_1) \
+	$(am__append_3) $(am__append_6) $(am__append_9) \
+	$(am__append_10) $(am__append_13) $(am__append_16)
+AM_CPPFLAGS = -Wall -Werror $(am__append_5) $(am__append_8) \
+	$(am__append_12) $(am__append_15) $(am__append_18)
 EXTRA_DIST = $(libpsensor_a_SOURCES) \
 	amd.c \
-	cpu.c \
+	pgtop2.c \
+	lmsensor.c \
 	nvidia.c \
-	pmem.c pmem.h
+	psensor_json.h psensor_json.c \
+	pudisks2.c
 
 all: all-am
 
@@ -370,7 +393,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/lib/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -405,19 +427,19 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdd_atasmart.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdd_hddtemp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmsensor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/measure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvidia.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgtop2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmutex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor_json.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pudisks2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/temperature.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
@@ -636,6 +658,8 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.