diff --git a/AUTHORS b/AUTHORS index b6d4261..10699a8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,11 @@ -LMT is the work of several people: +LMT version 1 (original python version): + Chris Morrone -1.x python version: Chris Morrone +LMT version 2 (rewrite with mysql history and java clients) + Java clients, LMT.pm perl module, and data aggregation scripts written + by Neil O'Neil, Jeff Long, and Paul Spencer (of LLNL visualization group) + Cerebro plugins and create_lmtconfig written by Herb Wartens. + Database schema developed jointly. -2.0 cerebro/mysql code: Herb Wartens -2.0 java clients, LMT.pm: Neil O'Neil, Jeff Long, and Paul Spencer - -3.0 cerebro/mysql code, utils: Jim Garlick +LMT version 3 (rewritten cerebro modules and C/curses ltop client) + Jim Garlick diff --git a/ChangeLog b/ChangeLog index d79650f..e69de29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,510 +0,0 @@ -2010-05-25 Jim Garlick - - * : Tagging lmt-2.6.4-1 - - * lmt.spec : Drop upgrade_lmtconfig-1.1 from package as it causes - lmt-server to require perl(Hostlist) and probably isn't really needed - anymore. - -2009-10-16 Jim Garlick - - * : Tagging lmt-2.6.3-3 - - * lmt.spec : BuildRequires IBM java if building on ch4 [chaos bz 831] - -2009-08-19 Jim Garlick - - * : Tagging lmt-2.6.3-2 - - * server/src/autogen.sh, server/src/config/* : Fix an inadvertant - build-time dependency on libtool. - -2009-08-19 Jim Garlick - - * : Tagging lmt-2.6.3 - - * Makefile : Change URL to google code, clean up unused stuff. - - * scripts/build : Check in missing Build Buddha script. - - * server/src : Check in configure scripts, Makefile.in's, etc.. - - * scripts/build-lmt-server.sh : Do not call autogen. - - * scripts/distro.sh : Removed, not used. - - * lmt.spec : Drop BuildRequires: ant-scripts as this seems not needed. - Drop BuildRequires for autotools since we checked in products. - Make BuildRequires for jre and java-devel instead of ibm-specific. - - * NEWS : Summarize LMT 2.x releases so far. - - * README : Update the somewhat dated description. - -2009-07-03 Jim Garlick - - * server/src/scripts/create_lmtconfig.pl : - - Add 'startidx' statement which can be used to continue an ost - sequence in a new ost stanza [Herb Wartens]. - - Use Getopt() for argument parsing. - - Incorporate Hostlist::expand() directly into script to avoid - unexpressed dependency on Hostlist.pm. - - Drop unused portions of config parser. - - Cat /usr/share/lmt/etc/create_schema-1.1.sql instead of - embedding the table creation SQL code in perl strings. - - Eliminate -t option. - - Add argument to -d option, which specifies the name of the file - system to create the database (including tables) for. - - Add support for ldev.conf. Make it the default if config file - is not specified. Add -F ldev-file to override path. - - * server/src/scripts/create_schema-1.1.sql : New. - - * doc/create_lmtconfig.8 : Document the above changes. - - * client/scripts/lwatch : Make an attempt to use of gij non-fatal - as we now seem to have Swing classes in RHEL 5.3, although it has - issues, see: http://code.google.com/p/lmt/issues/detail?id=2 - for what is probably the tip of the iceberg. - - * lmt.spec : Change lmt-client Requires: from jre-ibm to jre, - which should accomodate Sun, IBM, or GNU Java, selected by - /etc/alternatives/java. Continue to use IBM java in BuildRequires:. - - * server/src/scripts/upgrade_lmtconfig-1.1.pl : - Rename from update_lmtconfig. - - * doc/schema.txt : Removed, - server/src/scripts/create_schema-1.1.sql is now the definitive schema. - -2008-11-09 Herb Wartens - - * : Tagging lmt-2.6.2 - - * : Do not attempt to insert mds,oss,ost,rtr data - for items we have already inserted into the database - for a particular timestamp. - -2008-10-02 Herb Wartens - - * : Tagging lmt-2.6.1 - - * : Read from /proc/fs/lustre/mds/-MDT0000/stats - instead of /proc/fs/lustre/mdt/MDS/mds/stats to get mds statistics. - This required a protocol update for the mds metric module. - - * : Include update_lmtconfig for updating the database from - version 1.0 to 1.1. - We no longer use the old operations that were originally setup - in the database. The update script removes those operations - and inserts the newer ones that are possible to see from the - new mds stats file. This could be a small problem if we want - to view the historical data for these operations. - - * : Fix the database prepared statements to properly use - MYSQL_TYPE_LONGLONG for the parameters that need them. - This was a problem that was found by Andrew Uselton at LBL. - - * : Remove fix for bz197ch. We decided we should not - include iowait in the cpu usage value. - -2008-04-04 Herb Wartens - - * : Do not try to contact the local database for the - configuration of a particular filesystem, instead - read from the admin-only-readable configuration file - /usr/share/lmt/cron/lmtrc. This should make it possible - to write to non-local databases and also password-protect - databases if necessary. - -2008-02-13 Herb Wartens - - * : Tagging lmt-2.5.4 - - * : Created an initial manpage for create_lmtconfig. - -2008-02-12 Herb Wartens - - * : Update create_lmtconfig to include uuids to the - script file. This should help to make this less LLNL - specific. Still need to have some documentation for - the config file though. Cleanup whitespace. - Also make a manpage for create_lmtconfig and its - configuration file. - -2008-01-28 Herb Wartens - - * : Tagging lmt-2.5.3 - - * : Fix coverity bugs found. - run 16: - cid-1765, - cid-1766, - cid-1767, - cid-1768, - cid-1769, - cid-1770, - cid-1771 - -2008-01-25 Herb Wartens - - * : Tagging lmt-2.5.2 - - * : Removed debug statements when polling for a particular - lustre service and the service is not found. - -2008-01-24 Herb Wartens - - * : Fix bz197ch. Need to report iowait time with the cpu usage. - Also use unsigned long long to hold the cpu usage. - -2008-01-16 Herb Wartens - - * : Tagging lmt-2.5.1 - - * : Fix ost crashing bug bz173. Also made sure to initialize - some variables that weren't properly being initialized which could - lead to inconsistent behavior. - - * : Ensure that we always build with debugging symbols - and highest optimization level of -O2. Do not strip libraries - when building rpms. - - * : Instead of specofocall looking for the numrefs file - just skip over all non directories. This makes the - readdir code more generic. - -2008-01-12 Herb Wartens - - * : close mds directory after use. - -2008-01-11 Herb Wartens - - * : Tagging lmt-2.5.0 - - * : Add in fix to ensure that if cerebro is running - before mds is started, that the mds module will still - successfully load. When the mds is finally started - the module will function properly. - -2008-01-10 Herb Wartens - - * : Only install the *.so files to the cerebro module directory. - -2008-01-08 Herb Wartens - - * : Added initial functionality for automatic ost detection. - Now the parent thread will try to check if a thread is running - and restart threads for any ost service that is not currently - running. - - * : Fixed units for ost_read and ost_write. - - * : Try to address mds issue. I suspect that the problem - was that I was using an int for the number of samples. - Even this number can get pretty large. Try using an - unsigned long long here. Also print out a more verbose - error to help track down which metric was causing an issue. - -2008-01-07 Herb Wartens - - * : Properly use prepared statement for router as well. - - * : Fixed client to properly get CPU usage for the OSS data. - Also modified ltop to stop displaying CPU usage for the - OST data. Now it will only be shown with the OSS data. - -2007-12-28 Herb Wartens - - * : Modified xwatchadmin and xwatchclient accounts to - lwatchadmin and lwatchclient respectively. Added a global - SCHEMA_VERSION field to the FILESYSTEM_INFO table. - - * : Fixed CEREBRO_MODULE_DIR to point to proper directory. - Fixed function typo for - common_metric_lmt_destroy_metric_value_do_nothing. - Removed insertion success lines that were being sent to - /var/log/messages. - -2007-12-27 Herb Wartens - - * : When installing the rpm estart cerebrod if it is currently running. - Compile with -Wall. Fix some compile warnings - - * : Use cerebro_err_debug instead old macro CEREBRO_DBG - - * : Updated the monitor module to handle the mysql - server stopping/crashing from underneath it. - There is still an issue at initial reconnection where - some values inserted seem to be incorrect. - - * : Added in new server source - -2007-12-26 Herb Wartens - - * : Rebasing code to 2.5 branch to prepare for removal of old - python server code. - -2007-12-21 Herb Wartens - - * client/java/gov/llnl/lustre/ltop/Ltop.java : Updated file to - allow for longer mds oeration name lengths. - -2007-12-13 Herb Wartens - - * server/cron/lmt_agg.cron : Updated file to make sure to set - and pass $keep properly to lmt_agg.sh - -2007-10-11 Herb Wartens - - * : Tagging lmt-2.1.0 - - * lmt.spec : Updated specfile to ensure that we are building with - glibc-2.5-18 or greater on chaos4 systems due to glibc bug. Also - make sure to require ncurses-devel. - - * scripts/build-lmt-client.sh: If JAVA_HOME is not set try to use the - default redhat location, so that jni.h is properly found. - -2007-10-05 Herb Wartens - - * lmt.spec : Updated specfile to require ant-nodeps, - ant-scripts, and java-sdk-ibm on build. - - * : Tagging lmt-2.0.10 - - * lmt.spec : Updated specfile to require ant on build. - - * : Tagging lmt-2.0.9 - - * Makefile : Updated Makefile to check out latest copy of build - script and use that for building rpms. - - * : Tagging lmt-2.0.8 - - * scripts/install-lmt-server.sh : Make the install-lmt-server.sh - actually build the *.pyc and *.pyo files. - - * : Tagging lmt-2.0.7 - - * lmt.spec : Removed the lmt-legacy client. This means no - more wxpython! =) - Modified the name of xwatch-collector to lmtupdatedb. - - * doc/schema.txt : Added in a flat file for the current schema. - -2007-10-02 Herb Wartens - - * : Tagging lmt-2.0.6 - - * lmt.spec : Removed the default atrributes for most executables - so that rpm will decide what the defaults should be. Hopefully - it will pick sane defaults. - -2007-10-02 Jim Garlick - - * lmt.spec : If chaos4, update BuildRequires and package stray - pyo files. - -2007-10-01 Paul Spencer - - * : Fixed problem where cell highlighting was not following - sorting order. Now, only individual cells, that are out - of range, are highlighted. - -2007-09-12 Paul Spencer - - * : Added router aggregate plotting mods. - - * : Renamed JWatch to LWatch. - -2007-09-10 Paul Spencer - - * : Added initial preferences support to jwatch. - -2007-09-04 Paul Spencer - - * : Fixed problem where history plot End/Duration - setting was not being preserved between plots. - -2007-08-31 Paul Spencer - - * : Added SelectAll & DeselectAll buttons below - OST/Router list selector on history plot frame. - - * : Added "Shift Click" selection capability where - elements between the last click and the current - one are toggled on history plot frame. - - * : Added "Now" button to the "End" time interval as - a shortcut for setting the "End" time to the current - time on history plot frame. - - * : Changed "RawLive" granularity specification to - "Heartbeat" on history plot frame. - - * : When more than 8 curves are specified on history plot frame, - the legend is supressed. This fixes the problem where too - much real estate was being consumed by the legend. - - : * Cursor is now changed to "WAIT_CURSOR" when data is - being (re)loaded. - - * : Default granualrity, plot interval and refresh rate - for history plot was changed to "RAW", 2 hours, and - 15 seconds. Future plans are for this to be driven - by preferences or last setting. - - * : Added Hide/Show buttons to collapse and re-display - the control panel and overview panel on the history - plot frame. - -2007-08-09 Herb Wartens - - * : Tagging lmt-2.0.4 - - * : Fixed create_lmtconfig.pl to properly - populate FILESYSTEM_INFO. Also added - a FILESYSTEM_ID field to the MDS_INFO - table. Properly set OFFLINE when initially - populating the database. - - * : Various cron fixes for aggragate table population. - jwlong - - * : Scrolling capability added to ltop. - njoneill - -2007-07-26 Herb Wartens - - * : Tagging lmt-2.0.3 - - * : Added in copyright information. We are - "ready" for first release into the world. - wartens2 and jwlong - - * : OST_INFO no longer has FAILOVERHOST column. - njoneill - -2007-07-25 Herb Wartens - - * : Tagging lmt-2.0.2 - - * : Initial version of alert dialog for use with jwatch. - spencerp - - * : Added live update of raw data. spencerp - - * : Added router activation of history plots. spencerp - - * : Added plotting for Router and MDS and generalized data loading - method. spencerp - - * : Added in password generation to create_lmtconfig. - Fixed bug in CreateOST. - - * : Fixed error in MDS_AGGREGATE_HOUR table creation. - - * : Add in change to only allow xwatchadmin to log in from - localhost automatically. - Add in change to allow xwatchclient to log in from anywhere. - xwatchclient access will be restricted using iptables. - -2007-05-30 Herb Wartens - - * : Tagging lmt-2.0.1 - - * : Removed linuxdev group from the specfile. - - * : Modified init script permissions to 755. - - * : Try to use /usr/bin/java by default since we are - requiring the ibm java to be installed anyway. - - * : Modified so that the overview curve color matches the - legend and chart curve color. spencerp - - * : Added slider handles to the expander rectangles on the overview - panel. spencerp - -2007-05-30 Herb Wartens - - * : Tagging a release for lmt-2.0 - - * : Fixed permissions on files installed. - For now we are using linuxdev as the group. - - * : Force use of the jre-ibm for now. - - * : Fixed problem where left/right overview shift results in - difference between chart data interval and overview highlight - interval. spencerp - - * : Removed dead code. Reduced connection timeout to 3 sec. - Explicitly close lmtrc files after reading. Added comments. - njoneill - - * : Numerous minor tweaks to get better termination behavior, - especially after exceptions are thrown. njoneill - - * : Show help screen for any unexpected user input. njoneill - - * : Made local lmtrc fully override global lmtrc file. Added - error checking on lmtrc file. njoneill - - * : Removed local path additions from configure. jwlong - - * : Fixed bug caused by differing # of data values in DB tables - for different variables in load method. spencerp - -2007-05-29 Herb Wartens - - * : Tagging a beta release for lmt-2.0 - lmt-2.0b6 - - * : Fixed issue where filesystems were diplayed - out-of-order. njoneill - - * : Fixed issue for choosing filesystems with ltop. - njoneill - - * : Fixed ltop ncurses issue when running ltop --help. - njoneill - - -2007-04-17 Herb Wartens - - * : Tagging a beta release for lmt-2.0 - lmt-2.0b1 - -2007-03-16 Herb Wartens - - * xwatch-collector : Added in xwatch-collector to send data to - mysql database. This is to be used for xwatch-2.0. - - * create_lmtconfig : Added in tool to populate mysql database initially. - This tool uses the same .cfg file as we use to configure lustre. - -2007-01-17 Herb Wartens - * : Tag lmt-1.21 - * xwatch-lustre : Fixed bug in MDS stats collection where the collector - time was being used as opposed to the lmtd time from the mds. - -2006-11-02 Jim Garlick - * README : Added from the lmt-1.17 SF download page. - -2006-10-27 Jim Garlick - * : Tag lmt-1.20 - * lmt.spec : Force /usr/bin/python to avoid mutant one in /usr/local. - -2006-10-26 Jim Garlick - * lmtd : Update --help output to document -c option, - show correct port number. - * lmtcollect : Update --help output to document -c, -t, -x options. - * lmt.spec : Add doc files, misc cleanup. - * NEWS, META, DISCLAIMER, COPYING, ChangeLog : New, std. templates. - * example_syslog.py, query-lustre-config : Add legal headers. - -2006-10-25 Herb Wartens - * : Tag lmt-1.19 - * : Organize internal changes since sourceforge release of 1.17. diff --git a/README b/README index 4f96e5f..e1d321d 100644 --- a/README +++ b/README @@ -1,28 +1,30 @@ -LMT - Lustre Monitoring Tool +LMT3 - Lustre Monitoring Tool -LMT is a distributed system that provides a "top"-like display of the +ULMT is a distributed system that provides a "top"-like display of the activity levels of the server-side (MDS, OSSes, and LNET routers) nodes of one or more Lustre-based filesystems. It is possible to watch server metrics in real time, and to graph past behavior. The clients provide this capability, but it is also possible to directly mine the MySQL database, e.g. with SQL scripts and GNU plot. -Real time and historical data is kept in the MySQL datbase. LMT clients, -lwatch (GUI - java/swing), ltop (curses - java/charva), and lstat -(java -command line) speak only to MySQL. The clients are part of the -lmt-client RPM. +Real time and historical data is kept in the MySQL datbase. The java +clients, lwatch (GUI), oltop (curses), and lstat (command line) interface +only to MySQL. The clients are part of the lmt-client package, now +separately distributed. -There are four Cerebro "metric modules", lmt_mds, lmt_oss, lmt_ost, and +There are four Cerebro "metric modules", lmt_mdt, lmt_ost, lmt_osc, and lmt_router, which collect data from /proc on servers and inject messages -into the cerebro monitoring network. The collection plugins are part of the -lmt-server-agent RPM. +into the cerebro monitoring network. The collection plugins are part of +the lmt-server-agent package. Cerebro data is extracted and inserted into the database by a single cerebro -"monitor module". The monitor module and various scripts for initializing, -migrating, and munging the database data are part of the lmt-server RPM. +"monitor module". The monitor module and support utilities, including +the new ltop client (C/curses) which interfaces directly to cerebro, +are part of the lmt-server package. -Because the clients and data collection are separate and communicate only -via the database, we were able to develop LMT 2.0 in phases. In Phase 1, -the original LMT 1.0 data collection software was modified to inject data -into MySQL and the new clients were written. In Phase 2, data collection -was moved to Cerebro. +For more information, review the wiki pages at the LMT project page: + +http://code.google.com/p/lmt/ + +Jim Garlick +October, 2010 diff --git a/etc/lmt.conf.5.in b/etc/lmt.conf.5.in index 0c75a5f..7538e7b 100644 --- a/etc/lmt.conf.5.in +++ b/etc/lmt.conf.5.in @@ -52,6 +52,9 @@ The default causes MySQL's default user (your uid) to be used. .TP .I "lmt_db_rwpasswd = string" Set the password for read/write database access (default = nil). +.TP +.I "lmt_db_autoconf = n" +Set to 0 to disable database self-populating with lustre config (default = 1). .SH EXAMPLE .nf -- diff --git a/utils/Makefile.am b/utils/Makefile.am index b35e4f5..5e19f8b 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -2,41 +2,29 @@ AM_CFLAGS = @GCCWARN@ AM_CPPFLAGS = -I../liblsd -I../libproc -I../liblmt -I../liblmtdb -noinst_PROGRAMS = lmtdiagnose bin_PROGRAMS = ltop sbin_PROGRAMS = lmtmetric if MYSQL sbin_PROGRAMS += lmtinit -DBLIB = $(top_builddir)/liblmtdb/liblmtdb.la endif common_ldadd = \ - $(DBLIB) \ $(top_builddir)/liblmt/liblmt.la \ $(top_builddir)/libproc/libproc.la \ $(top_builddir)/liblsd/liblsd.la ltop_SOURCES = ltop.c sample.c ltop_LDADD = $(common_ldadd) $(LIBCURSES) +man1_MANS = ltop.1 +CLEANFILES = ltop.1 lmtmetric_SOURCES = lmtmetric.c lmtmetric_LDADD = $(common_ldadd) -lmtdiagnose_SOURCES = lmtdiagnose.c -lmtdiagnose_LDADD = $(common_ldadd) - if MYSQL lmtinit_SOURCES = lmtinit.c -lmtinit_LDADD = $(common_ldadd) -endif - -man1_MANS = \ - ltop.1 -if MYSQL -man8_MANS = \ - lmtinit.8 +lmtinit_LDADD = $(top_builddir)/liblmtdb/liblmtdb.la $(common_ldadd) +man8_MANS = lmtinit.8 +CLEANFILES += lmtinit.8 endif -CLEANFILES = \ - ltop.1 \ - lmtinit.8 diff --git a/utils/Makefile.in b/utils/Makefile.in index cd6efb7..4eaab4f 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -37,10 +37,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -noinst_PROGRAMS = lmtdiagnose$(EXEEXT) bin_PROGRAMS = ltop$(EXEEXT) sbin_PROGRAMS = lmtmetric$(EXEEXT) $(am__EXEEXT_1) @MYSQL_TRUE@am__append_1 = lmtinit +@MYSQL_TRUE@am__append_2 = lmtinit.8 subdir = utils DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/lmtinit.8.in $(srcdir)/ltop.1.in @@ -62,26 +62,23 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @MYSQL_TRUE@am__EXEEXT_1 = lmtinit$(EXEEXT) sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) -am_lmtdiagnose_OBJECTS = lmtdiagnose.$(OBJEXT) -lmtdiagnose_OBJECTS = $(am_lmtdiagnose_OBJECTS) -@MYSQL_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/liblmtdb/liblmtdb.la -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ - $(top_builddir)/liblmt/liblmt.la \ - $(top_builddir)/libproc/libproc.la \ - $(top_builddir)/liblsd/liblsd.la -lmtdiagnose_DEPENDENCIES = $(am__DEPENDENCIES_2) +PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) am__lmtinit_SOURCES_DIST = lmtinit.c @MYSQL_TRUE@am_lmtinit_OBJECTS = lmtinit.$(OBJEXT) lmtinit_OBJECTS = $(am_lmtinit_OBJECTS) -@MYSQL_TRUE@lmtinit_DEPENDENCIES = $(am__DEPENDENCIES_2) +am__DEPENDENCIES_1 = $(top_builddir)/liblmt/liblmt.la \ + $(top_builddir)/libproc/libproc.la \ + $(top_builddir)/liblsd/liblsd.la +@MYSQL_TRUE@lmtinit_DEPENDENCIES = \ +@MYSQL_TRUE@ $(top_builddir)/liblmtdb/liblmtdb.la \ +@MYSQL_TRUE@ $(am__DEPENDENCIES_1) am_lmtmetric_OBJECTS = lmtmetric.$(OBJEXT) lmtmetric_OBJECTS = $(am_lmtmetric_OBJECTS) -lmtmetric_DEPENDENCIES = $(am__DEPENDENCIES_2) +lmtmetric_DEPENDENCIES = $(am__DEPENDENCIES_1) am_ltop_OBJECTS = ltop.$(OBJEXT) sample.$(OBJEXT) ltop_OBJECTS = $(am_ltop_OBJECTS) -am__DEPENDENCIES_3 = -ltop_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) +am__DEPENDENCIES_2 = +ltop_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -93,10 +90,9 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(lmtdiagnose_SOURCES) $(lmtinit_SOURCES) \ - $(lmtmetric_SOURCES) $(ltop_SOURCES) -DIST_SOURCES = $(lmtdiagnose_SOURCES) $(am__lmtinit_SOURCES_DIST) \ - $(lmtmetric_SOURCES) $(ltop_SOURCES) +SOURCES = $(lmtinit_SOURCES) $(lmtmetric_SOURCES) $(ltop_SOURCES) +DIST_SOURCES = $(am__lmtinit_SOURCES_DIST) $(lmtmetric_SOURCES) \ + $(ltop_SOURCES) man1dir = $(mandir)/man1 man8dir = $(mandir)/man8 NROFF = nroff @@ -251,31 +247,20 @@ target_os = @target_os@ target_vendor = @target_vendor@ AM_CFLAGS = @GCCWARN@ AM_CPPFLAGS = -I../liblsd -I../libproc -I../liblmt -I../liblmtdb -@MYSQL_TRUE@DBLIB = $(top_builddir)/liblmtdb/liblmtdb.la common_ldadd = \ - $(DBLIB) \ $(top_builddir)/liblmt/liblmt.la \ $(top_builddir)/libproc/libproc.la \ $(top_builddir)/liblsd/liblsd.la ltop_SOURCES = ltop.c sample.c ltop_LDADD = $(common_ldadd) $(LIBCURSES) +man1_MANS = ltop.1 +CLEANFILES = ltop.1 $(am__append_2) lmtmetric_SOURCES = lmtmetric.c lmtmetric_LDADD = $(common_ldadd) -lmtdiagnose_SOURCES = lmtdiagnose.c -lmtdiagnose_LDADD = $(common_ldadd) @MYSQL_TRUE@lmtinit_SOURCES = lmtinit.c -@MYSQL_TRUE@lmtinit_LDADD = $(common_ldadd) -man1_MANS = \ - ltop.1 - -@MYSQL_TRUE@man8_MANS = \ -@MYSQL_TRUE@ lmtinit.8 - -CLEANFILES = \ - ltop.1 \ - lmtinit.8 - +@MYSQL_TRUE@lmtinit_LDADD = $(top_builddir)/liblmtdb/liblmtdb.la $(common_ldadd) +@MYSQL_TRUE@man8_MANS = lmtinit.8 all: all-am .SUFFIXES: @@ -341,13 +326,6 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" @@ -376,9 +354,6 @@ clean-sbinPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -lmtdiagnose$(EXEEXT): $(lmtdiagnose_OBJECTS) $(lmtdiagnose_DEPENDENCIES) - @rm -f lmtdiagnose$(EXEEXT) - $(LINK) $(lmtdiagnose_LDFLAGS) $(lmtdiagnose_OBJECTS) $(lmtdiagnose_LDADD) $(LIBS) lmtinit$(EXEEXT): $(lmtinit_OBJECTS) $(lmtinit_DEPENDENCIES) @rm -f lmtinit$(EXEEXT) $(LINK) $(lmtinit_LDFLAGS) $(lmtinit_OBJECTS) $(lmtinit_LDADD) $(LIBS) @@ -395,7 +370,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtdiagnose.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtinit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtmetric.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltop.Po@am__quote@ @@ -632,7 +606,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS clean-sbinPROGRAMS mostlyclean-am + clean-sbinPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -684,14 +658,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \ uninstall-man: uninstall-man1 uninstall-man8 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool clean-noinstPROGRAMS \ - clean-sbinPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-man1 install-man8 install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + clean-generic clean-libtool clean-sbinPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-man1 install-man8 \ + install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS \