Minor changes.

git-svn-id: svn://svn.zabbix.com/trunk@1843 97f52cf1-0a1b-0410-bd0e-c28be96e8082

5 files changed, 5 insertions, 136 deletions

diff --git a/src/libs/zbxcrypto/Makefile.am b/src/libs/zbxcrypto/Makefile.am
index 6c18a261..9a3b7965 100644
--- a/src/libs/zbxcrypto/Makefile.am
+++ b/src/libs/zbxcrypto/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS=.
-lib_LIBRARIES = zbxcrypto.a
-zbxcrypto_a_SOURCES = md5.c
+lib_LIBRARIES=libzbxcrypto.a
+libzbxcrypto_a_SOURCES=md5.c
diff --git a/src/libs/zbxcrypto/md5.h b/src/libs/zbxcrypto/md5.h
deleted file mode 100644
index 37855ebb..00000000
--- a/src/libs/zbxcrypto/md5.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/* $Id$ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.h is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Removed support for non-ANSI compilers; removed
-	references to Ghostscript; clarified derivation from RFC 1321;
-	now handles byte order either statically or dynamically.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
-	added conditionalization for C++ compilation from Martin
-	Purschke <purschke@bnl.gov>.
-  1999-05-03 lpd Original version.
- */
-
-#ifndef md5_INCLUDED
-#  define md5_INCLUDED
-
-/*
- * This package supports both compile-time and run-time determination of CPU
- * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
- * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
- * defined as non-zero, the code will be compiled to run only on big-endian
- * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
- * run on either big- or little-endian CPUs, but will run slightly less
- * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
- */
-
-#define MD5_DIGEST_SIZE 16
-
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
-    md5_word_t count[2];	/* message length in bits, lsw first */
-    md5_word_t abcd[4];		/* digest buffer */
-    md5_byte_t buf[64];		/* accumulate block */
-} md5_state_t;
-
-#ifdef __cplusplus
-extern "C" 
-{
-#endif
-
-/* Initialize the algorithm. */
-void md5_init(md5_state_t *pms);
-
-/* Append a string to the message. */
-void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
-
-/* Finish the message and return the digest. */
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
-
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
-
-#endif /* md5_INCLUDED */
diff --git a/src/libs/zbxlog/Makefile.am b/src/libs/zbxlog/Makefile.am
index c7a7723e..0d02fa69 100644
--- a/src/libs/zbxlog/Makefile.am
+++ b/src/libs/zbxlog/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS=.
-lib_LIBRARIES = zbxlog.a
-zbxlog_a_SOURCES = log.c
+lib_LIBRARIES=libzbxlog.a
+libzbxlog_a_SOURCES=log.c
diff --git a/src/libs/zbxlog/log.h b/src/libs/zbxlog/log.h
deleted file mode 100644
index 441e0929..00000000
--- a/src/libs/zbxlog/log.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
-** ZABBIX
-** Copyright (C) 2000-2005 SIA Zabbix
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**/
-
-#ifndef ZABBIX_LOG_H
-#define ZABBIX_LOG_H
-
-#define LOG_LEVEL_EMPTY		0
-#define LOG_LEVEL_CRIT		1
-#define LOG_LEVEL_ERR		2
-#define LOG_LEVEL_WARNING	3
-#define LOG_LEVEL_DEBUG		4
-
-#define LOG_TYPE_UNDEFINED	0
-#define LOG_TYPE_SYSLOG		1
-#define LOG_TYPE_FILE		2
-
-/* Type - 0 (syslog), 1 - file */
-int zabbix_open_log(int type,int level, const char *filename);
-void zabbix_log(int level, const char *fmt, ...);
-void zabbix_set_log_level(int level);
-
-#endif
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am
index 9c512b97..77c17f77 100644
--- a/src/zabbix_agent/Makefile.am
+++ b/src/zabbix_agent/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS = .
 bin_PROGRAMS = zabbix_agentd
 zabbix_agentd_SOURCES = active.c  cpustat.c  diskdevices.c  interfaces.c  logfiles.c  stats.c  sysinfo.c zabbix_agentd.c
-zabbix_agentd_LDADD = ../libs/zbxlog/zbxlog.a ../libs/zbxcrypto/zbxcrypto.a
+zabbix_agentd_LDADD = ../libs/zbxlog/libzbxlog.a ../libs/zbxcrypto/libzbxcrypto.a