[NeoStats-Devel] [Commits] r2649 - in trunk: . lib lib/dbm modules modules/dbm modules/dbm/bdb modules/dbm/gdbm modules/protocol protocol
[email protected] Thu, 7 Jul 2005 23:22:58 +1000
Newsgroups
gmane.comp.neostats.devel
Message-ID
<[email protected] >
Author: Fish
Date: Thu Jul 7 21:22:50 2005
New Revision: 2649
Added:
trunk/modules/dbm/
- copied from r2641, trunk/lib/dbm/
trunk/modules/protocol/
- copied from r2642, trunk/protocol/
Removed:
trunk/lib/dbm/
trunk/protocol/
Modified:
trunk/Makefile.am
trunk/Makefile.in
trunk/configure
trunk/configure.in
trunk/lib/Makefile.am
trunk/lib/Makefile.in
trunk/modules/Makefile.am
trunk/modules/Makefile.in
trunk/modules/dbm/Makefile.in
trunk/modules/dbm/bdb/Makefile.in
trunk/modules/dbm/gdbm/Makefile.in
trunk/modules/protocol/Makefile.in
Log:
change layout based on M's feedback
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Thu Jul 7 21:22:50 2005
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = include lib src modules protocol
+SUBDIRS = include lib src modules
ACLOCAL_AMFLAGS = -I autotools
AM_MAKEFLAGS = -s
dist_bin_SCRIPTS = makeconf
Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in (original)
+++ trunk/Makefile.in Thu Jul 7 21:22:50 2005
@@ -224,7 +224,7 @@
unamepath = @unamepath@
wi_PWD = @wi_PWD@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = include lib src modules protocol
+SUBDIRS = include lib src modules
ACLOCAL_AMFLAGS = -I autotools
AM_MAKEFLAGS = -s
dist_bin_SCRIPTS = makeconf
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Jul 7 21:22:50 2005
@@ -28538,7 +28538,7 @@
- ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile protocol/Makefile lib/dbm/Makefile lib/dbm/bdb/Makefile lib/dbm/gdbm/Makefile lib/Makefile lib/curl/Makefile lib/pcre/Makefile lib/event/Makefile modules/Makefile modules/connectserv/Makefile modules/extauth/Makefile modules/hostserv/Makefile modules/ircdauth/Makefile modules/statserv/Makefile modules/textserv/Makefile modules/quoteserv/Makefile modules/limitserv/Makefile modules/operlog/Makefile modules/dccpartyline/Makefile neostats"
+ ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile modules/protocol/Makefile modules/dbm/Makefile modules/dbm/bdb/Makefile modules/dbm/gdbm/Makefile lib/Makefile lib/curl/Makefile lib/pcre/Makefile lib/event/Makefile modules/Makefile modules/connectserv/Makefile modules/extauth/Makefile modules/hostserv/Makefile modules/ircdauth/Makefile modules/statserv/Makefile modules/textserv/Makefile modules/quoteserv/Makefile modules/limitserv/Makefile modules/operlog/Makefile modules/dccpartyline/Makefile neostats"
cat >confcache <<\_ACEOF
@@ -29182,10 +29182,10 @@
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "protocol/Makefile" ) CONFIG_FILES="$CONFIG_FILES protocol/Makefile" ;;
- "lib/dbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dbm/Makefile" ;;
- "lib/dbm/bdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dbm/bdb/Makefile" ;;
- "lib/dbm/gdbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dbm/gdbm/Makefile" ;;
+ "modules/protocol/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/protocol/Makefile" ;;
+ "modules/dbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/dbm/Makefile" ;;
+ "modules/dbm/bdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/dbm/bdb/Makefile" ;;
+ "modules/dbm/gdbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/dbm/gdbm/Makefile" ;;
"lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"lib/curl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/curl/Makefile" ;;
"lib/pcre/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/pcre/Makefile" ;;
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Jul 7 21:22:50 2005
@@ -425,10 +425,10 @@
AC_CONFIG_FILES([Makefile
include/Makefile
src/Makefile
- protocol/Makefile
- lib/dbm/Makefile
- lib/dbm/bdb/Makefile
- lib/dbm/gdbm/Makefile
+ modules/protocol/Makefile
+ modules/dbm/Makefile
+ modules/dbm/bdb/Makefile
+ modules/dbm/gdbm/Makefile
lib/Makefile
lib/curl/Makefile
lib/pcre/Makefile
Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am (original)
+++ trunk/lib/Makefile.am Thu Jul 7 21:22:50 2005
@@ -1,3 +1,3 @@
-SUBDIRS = pcre curl event dbm
+SUBDIRS = pcre curl event
include $(top_srcdir)/autotools/rules.mk
Modified: trunk/lib/Makefile.in
==============================================================================
--- trunk/lib/Makefile.in (original)
+++ trunk/lib/Makefile.in Thu Jul 7 21:22:50 2005
@@ -190,7 +190,7 @@
target_alias = @target_alias@
unamepath = @unamepath@
wi_PWD = @wi_PWD@
-SUBDIRS = pcre curl event dbm
+SUBDIRS = pcre curl event
LINK = $(LIBTOOL) --tag=CXX --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am (original)
+++ trunk/modules/Makefile.am Thu Jul 7 21:22:50 2005
@@ -1,5 +1,5 @@
-SUBDIRS = @MODULES@
+SUBDIRS = dbm protocol @MODULES@
EXTRA_DIST = modules.txt
-include $(top_srcdir)/autotools/rules.mk
\ No newline at end of file
+include $(top_srcdir)/autotools/rules.mk
Modified: trunk/modules/Makefile.in
==============================================================================
--- trunk/modules/Makefile.in (original)
+++ trunk/modules/Makefile.in Thu Jul 7 21:22:50 2005
@@ -190,7 +190,7 @@
target_alias = @target_alias@
unamepath = @unamepath@
wi_PWD = @wi_PWD@
-SUBDIRS = @MODULES@
+SUBDIRS = dbm protocol @MODULES@
EXTRA_DIST = modules.txt
LINK = $(LIBTOOL) --tag=CXX --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
Modified: trunk/modules/dbm/Makefile.in
==============================================================================
--- trunk/lib/dbm/Makefile.in (original)
+++ trunk/modules/dbm/Makefile.in Thu Jul 7 21:22:50 2005
@@ -36,7 +36,7 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/autotools/rules.mk
-subdir = lib/dbm
+subdir = modules/dbm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \
$(top_srcdir)/autotools/ax_maintainer_mode_auto_silent.m4 \
@@ -207,9 +207,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dbm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/dbm/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dbm/Makefile
+ $(AUTOMAKE) --gnu modules/dbm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: trunk/modules/dbm/bdb/Makefile.in
==============================================================================
--- trunk/lib/dbm/bdb/Makefile.in (original)
+++ trunk/modules/dbm/bdb/Makefile.in Thu Jul 7 21:22:50 2005
@@ -39,7 +39,7 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/autotools/rules.mk
-subdir = lib/dbm/bdb
+subdir = modules/dbm/bdb
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \
$(top_srcdir)/autotools/ax_maintainer_mode_auto_silent.m4 \
@@ -227,9 +227,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dbm/bdb/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/dbm/bdb/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dbm/bdb/Makefile
+ $(AUTOMAKE) --gnu modules/dbm/bdb/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: trunk/modules/dbm/gdbm/Makefile.in
==============================================================================
--- trunk/lib/dbm/gdbm/Makefile.in (original)
+++ trunk/modules/dbm/gdbm/Makefile.in Thu Jul 7 21:22:50 2005
@@ -39,7 +39,7 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/autotools/rules.mk
-subdir = lib/dbm/gdbm
+subdir = modules/dbm/gdbm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \
$(top_srcdir)/autotools/ax_maintainer_mode_auto_silent.m4 \
@@ -236,9 +236,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/dbm/gdbm/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/dbm/gdbm/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/dbm/gdbm/Makefile
+ $(AUTOMAKE) --gnu modules/dbm/gdbm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Modified: trunk/modules/protocol/Makefile.in
==============================================================================
--- trunk/protocol/Makefile.in (original)
+++ trunk/modules/protocol/Makefile.in Thu Jul 7 21:22:50 2005
@@ -21,7 +21,7 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -39,7 +39,7 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/autotools/rules.mk
-subdir = protocol
+subdir = modules/protocol
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \
$(top_srcdir)/autotools/ax_maintainer_mode_auto_silent.m4 \
@@ -294,9 +294,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu protocol/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/protocol/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu protocol/Makefile
+ $(AUTOMAKE) --gnu modules/protocol/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -437,7 +437,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../autotools
+ $(mkdir_p) $(distdir)/../../autotools
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \