X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fserver%2FMakefile.in;h=19911f3e49de07b421ccefa47b41d7549437b4ae;hb=d5691e85f6c758624df014a2b4008d356518ba43;hp=8a0de616c47b6158bd81430c334b752521f86bb5;hpb=405b9cbf6fd051c7f145b6457e9b78d5c5f5153b;p=psensor.git diff --git a/src/server/Makefile.in b/src/server/Makefile.in index 8a0de61..19911f3 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -37,7 +37,9 @@ host_triplet = @host@ bin_PROGRAMS = psensor-server$(EXEEXT) @GTOP_TRUE@am__append_1 = $(GTOP_CFLAGS) @GTOP_TRUE@am__append_2 = $(GTOP_LIBS) -@GTOP_TRUE@@SYSINFO_FCT_TRUE@am__append_3 = sysinfo.h sysinfo.c +@GTOP_TRUE@am__append_3 = sysinfo.h sysinfo.c +@ATASMART_TRUE@am__append_4 = $(ATASMART_CFLAGS) +@ATASMART_TRUE@am__append_5 = $(ATASMART_LIBS) subdir = src/server DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -53,7 +55,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am__psensor_server_SOURCES_DIST = server.c server.h sysinfo.h \ sysinfo.c -@GTOP_TRUE@@SYSINFO_FCT_TRUE@am__objects_1 = sysinfo.$(OBJEXT) +@GTOP_TRUE@am__objects_1 = sysinfo.$(OBJEXT) am_psensor_server_OBJECTS = server.$(OBJEXT) $(am__objects_1) psensor_server_OBJECTS = $(am_psensor_server_OBJECTS) psensor_server_LDADD = $(LDADD) @@ -88,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) @@ -98,6 +106,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -117,8 +127,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GCONFTOOL = @GCONFTOOL@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ @@ -148,7 +161,8 @@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = ../lib/libpsensor.a $(SENSORS_LIBS) $(JSON_LIBS) \ - $(LIBMICROHTTPD_LIBS) $(am__append_2) + $(LIBMICROHTTPD_LIBS) $(PTHREAD_LIBS) $(am__append_2) \ + $(am__append_5) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -172,6 +186,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ +PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ @@ -240,10 +255,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ psensor_server_SOURCES = server.c server.h $(am__append_3) -AM_CPPFLAGS = -pedantic -Wall -Werror \ - -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/lib $(SENSORS_CFLAGS) $(JSON_CFLAGS) \ - $(LIBMICROHTTPD_CFLAGS) $(am__append_1) +AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ + -I$(top_srcdir)/src -I$(top_srcdir)/src/lib $(SENSORS_CFLAGS) \ + $(JSON_CFLAGS) $(LIBMICROHTTPD_CFLAGS) $(am__append_1) \ + $(am__append_4) @GTOP_TRUE@AM_LDFLAGS = -Wl,--as-needed dist_man_MANS = psensor-server.1 EXTRA_DIST = description.txt @@ -318,7 +333,7 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -psensor-server$(EXEEXT): $(psensor_server_OBJECTS) $(psensor_server_DEPENDENCIES) +psensor-server$(EXEEXT): $(psensor_server_OBJECTS) $(psensor_server_DEPENDENCIES) $(EXTRA_psensor_server_DEPENDENCIES) @rm -f psensor-server$(EXEEXT) $(LINK) $(psensor_server_OBJECTS) $(psensor_server_LDADD) $(LIBS) @@ -379,9 +394,7 @@ uninstall-man1: sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -495,10 +508,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: