rename libratbox to librb, since its pretty modified anyway

This commit is contained in:
William Pitcock 2016-03-06 02:29:53 -06:00
parent 36588d4eac
commit c83f2f5e12
73 changed files with 33 additions and 33 deletions

View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libratbox SUBDIRS = librb
if BUILD_LTDL if BUILD_LTDL
SUBDIRS += libltdl SUBDIRS += libltdl

View file

@ -1,7 +1,7 @@
pkglibexec_PROGRAMS = authd pkglibexec_PROGRAMS = authd
AM_CFLAGS=$(WARNFLAGS) AM_CFLAGS=$(WARNFLAGS)
AM_CPPFLAGS = -I../include -I../libratbox/include AM_CPPFLAGS = -I../include -I../librb/include
authd_SOURCES = authd.c res.c reslib.c dns.c authd_SOURCES = authd.c res.c reslib.c dns.c
authd_LDADD = ../libratbox/src/libratbox.la authd_LDADD = ../librb/src/librb.la

View file

@ -78,9 +78,9 @@ run_or_die ()
parse_options "$@" parse_options "$@"
echo "Building libratbox autotools files." echo "Building librb autotools files."
cd "$TOP_DIR"/libratbox cd "$TOP_DIR"/librb
bash autogen.sh bash autogen.sh
echo "Building main autotools files." echo "Building main autotools files."

View file

@ -2,15 +2,15 @@ pkglibexec_PROGRAMS = bandb
bin_PROGRAMS = bantool bin_PROGRAMS = bantool
AM_CFLAGS=$(WARNFLAGS) AM_CFLAGS=$(WARNFLAGS)
AM_CPPFLAGS = -I../include -I../libratbox/include @SQLITE_INCLUDES@ AM_CPPFLAGS = -I../include -I../librb/include @SQLITE_INCLUDES@
AM_CPPFLAGS += -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION AM_CPPFLAGS += -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
bandb_SOURCES = bandb.c rsdb_sqlite3.c rsdb_snprintf.c bandb_SOURCES = bandb.c rsdb_sqlite3.c rsdb_snprintf.c
EXTRA_bandb_SOURCES = sqlite3.c EXTRA_bandb_SOURCES = sqlite3.c
bandb_LDADD = ../libratbox/src/libratbox.la @SQLITE_LD@ @SQLITE_OBJ@ bandb_LDADD = ../librb/src/librb.la @SQLITE_LD@ @SQLITE_OBJ@
bandb_DEPENDENCIES = @SQLITE_OBJ@ bandb_DEPENDENCIES = @SQLITE_OBJ@
bantool_SOURCES = bantool.c rsdb_sqlite3.c rsdb_snprintf.c bantool_SOURCES = bantool.c rsdb_sqlite3.c rsdb_snprintf.c
EXTRA_bantool_SOURCES = sqlite3.c EXTRA_bantool_SOURCES = sqlite3.c
bantool_LDADD = ../libratbox/src/libratbox.la @SQLITE_LD@ @SQLITE_OBJ@ bantool_LDADD = ../librb/src/librb.la @SQLITE_LD@ @SQLITE_OBJ@
bantool_DEPENDENCIES = @SQLITE_OBJ@ bantool_DEPENDENCIES = @SQLITE_OBJ@

View file

@ -19,7 +19,7 @@ fi
AC_PREFIX_DEFAULT($HOME/ircd) AC_PREFIX_DEFAULT($HOME/ircd)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(include/setup.h) AC_CONFIG_HEADER(include/setup.h)
AC_CONFIG_SUBDIRS([libratbox]) AC_CONFIG_SUBDIRS([librb])
AC_CONFIG_AUX_DIR([libltdl/config]) AC_CONFIG_AUX_DIR([libltdl/config])
AM_INIT_AUTOMAKE([subdir-objects]) AM_INIT_AUTOMAKE([subdir-objects])

View file

@ -1,7 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include $(LTDLINCL) AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/librb/include $(LTDLINCL)
AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared
AM_LDFLAGS += -export-symbols-regex _mheader AM_LDFLAGS += -export-symbols-regex _mheader
LIBS += $(top_srcdir)/libratbox/src/libratbox.la $(top_srcdir)/ircd/libircd.la LIBS += $(top_srcdir)/librb/src/librb.la $(top_srcdir)/ircd/libircd.la
extensiondir=@moduledir@/extensions extensiondir=@moduledir@/extensions

View file

@ -3,8 +3,8 @@ AUTOMAKE_OPTIONS = foreign
prefix = @prefix@ prefix = @prefix@
libircddir = @libdir@ libircddir = @libdir@
AM_CPPFLAGS = @LTDLINCL@ -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include AM_CPPFLAGS = @LTDLINCL@ -I$(top_srcdir)/include -I$(top_srcdir)/librb/include
AM_LDFLAGS = -L$(top_srcdir)/libratbox/src -export-dynamic -avoid-version -no-undefined AM_LDFLAGS = -L$(top_srcdir)/librb/src -export-dynamic -avoid-version -no-undefined
AM_YFLAGS = -d AM_YFLAGS = -d
BUILT_SOURCES = version.c BUILT_SOURCES = version.c
@ -66,13 +66,13 @@ libircd_la_SOURCES = \
version.c \ version.c \
whowas.c whowas.c
libircd_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version libircd_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version
libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/libratbox/src -lratbox libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/librb/src -lratbox
libircd_LTLIBRARIES = libircd.la libircd_LTLIBRARIES = libircd.la
bin_PROGRAMS = charybdis bin_PROGRAMS = charybdis
charybdis_SOURCES = main.c charybdis_SOURCES = main.c
charybdis_LDFLAGS = $(EXTRA_FLAGS) -dlopen self charybdis_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
charybdis_LDADD = libircd.la -L$(top_srcdir)/libratbox/src -lratbox charybdis_LDADD = libircd.la -L$(top_srcdir)/librb/src -lratbox
install-exec-hook: install-libircdLTLIBRARIES install-exec-hook: install-libircdLTLIBRARIES
$(RM) -f version.c $(RM) -f version.c

View file

@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = src SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libratbox.pc pkgconfig_DATA = librb.pc

View file

@ -15418,7 +15418,7 @@ ac_config_commands="$ac_config_commands include/librb-config.h"
ac_config_files="$ac_config_files src/Makefile Makefile libratbox.pc" ac_config_files="$ac_config_files src/Makefile Makefile librb.pc"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
@ -16523,7 +16523,7 @@ do
"include/librb-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/librb-config.h" ;; "include/librb-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/librb-config.h" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"libratbox.pc") CONFIG_FILES="$CONFIG_FILES libratbox.pc" ;; "librb.pc") CONFIG_FILES="$CONFIG_FILES librb.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac esac

View file

@ -670,7 +670,7 @@ fi
AC_CONFIG_FILES( \ AC_CONFIG_FILES( \
src/Makefile \ src/Makefile \
Makefile \ Makefile \
libratbox.pc librb.pc
) )
AC_OUTPUT AC_OUTPUT

View file

@ -4,11 +4,11 @@ datarootdir=@datarootdir@
data_dir=@datadir@/@PACKAGE_NAME@ data_dir=@datadir@/@PACKAGE_NAME@
version=@PACKAGE_VERSION@ version=@PACKAGE_VERSION@
include_dir=@includedir@/libratbox include_dir=@includedir@/librb
lib_dir=@libdir@ lib_dir=@libdir@
Name: libratbox Name: librb
Description: Portable runtime for ircd-ratbox and other things Description: Portable runtime for charybdis and other things, based on libratbox
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${lib_dir} -lratbox Libs: -L${lib_dir} -lrb
Cflags: -I${include_dir} Cflags: -I${include_dir}

View file

@ -13,7 +13,7 @@ version.c: version.c.SH ../CREDITS
version.lo: version.c ../include/serno.h version.lo: version.c ../include/serno.h
$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
libratbox_la_SOURCES = \ librb_la_SOURCES = \
unix.c \ unix.c \
win32.c \ win32.c \
crypt.c \ crypt.c \
@ -41,6 +41,6 @@ libratbox_la_SOURCES = \
arc4random.c \ arc4random.c \
version.c version.c
libratbox_la_LDFLAGS = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt librb_la_LDFLAGS = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt
libratbox_la_LIBADD = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@ librb_la_LIBADD = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@
lib_LTLIBRARIES = libratbox.la lib_LTLIBRARIES = librb.la

View file

@ -1,9 +1,9 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include $(LTDLINCL) AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/librb/include $(LTDLINCL)
AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared AM_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -shared
AM_LDFLAGS += -export-symbols-regex _mheader AM_LDFLAGS += -export-symbols-regex _mheader
LIBS += $(top_srcdir)/libratbox/src/libratbox.la $(top_srcdir)/ircd/libircd.la LIBS += $(top_srcdir)/librb/src/librb.la $(top_srcdir)/ircd/libircd.la
auto_load_moddir=@moduledir@/autoload auto_load_moddir=@moduledir@/autoload

View file

@ -1,7 +1,7 @@
pkglibexec_PROGRAMS = ssld pkglibexec_PROGRAMS = ssld
AM_CFLAGS=$(WARNFLAGS) AM_CFLAGS=$(WARNFLAGS)
AM_CPPFLAGS = -I../include -I../libratbox/include AM_CPPFLAGS = -I../include -I../librb/include
ssld_SOURCES = ssld.c ssld_SOURCES = ssld.c
ssld_LDADD = ../libratbox/src/libratbox.la @ZLIB_LD@ ssld_LDADD = ../librb/src/librb.la @ZLIB_LD@

View file

@ -1,6 +1,6 @@
bin_PROGRAMS = charybdis-mkpasswd bin_PROGRAMS = charybdis-mkpasswd
AM_CFLAGS=$(WARNFLAGS) AM_CFLAGS=$(WARNFLAGS)
AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../libratbox/include -I. AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../librb/include -I.
charybdis_mkpasswd_SOURCES = mkpasswd.c charybdis_mkpasswd_SOURCES = mkpasswd.c
charybdis_mkpasswd_LDADD = ../libratbox/src/libratbox.la charybdis_mkpasswd_LDADD = ../librb/src/librb.la