rename libratbox to librb, since its pretty modified anyway
This commit is contained in:
parent
36588d4eac
commit
c83f2f5e12
73 changed files with 33 additions and 33 deletions
|
@ -1,7 +1,7 @@
|
|||
AUTOMAKE_OPTIONS = foreign
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = libratbox
|
||||
SUBDIRS = librb
|
||||
|
||||
if BUILD_LTDL
|
||||
SUBDIRS += libltdl
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
pkglibexec_PROGRAMS = authd
|
||||
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_LDADD = ../libratbox/src/libratbox.la
|
||||
authd_LDADD = ../librb/src/librb.la
|
||||
|
|
|
@ -78,9 +78,9 @@ run_or_die ()
|
|||
|
||||
parse_options "$@"
|
||||
|
||||
echo "Building libratbox autotools files."
|
||||
echo "Building librb autotools files."
|
||||
|
||||
cd "$TOP_DIR"/libratbox
|
||||
cd "$TOP_DIR"/librb
|
||||
bash autogen.sh
|
||||
|
||||
echo "Building main autotools files."
|
||||
|
|
|
@ -2,15 +2,15 @@ pkglibexec_PROGRAMS = bandb
|
|||
bin_PROGRAMS = bantool
|
||||
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
|
||||
|
||||
bandb_SOURCES = bandb.c rsdb_sqlite3.c rsdb_snprintf.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@
|
||||
|
||||
bantool_SOURCES = bantool.c rsdb_sqlite3.c rsdb_snprintf.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@
|
||||
|
|
|
@ -19,7 +19,7 @@ fi
|
|||
AC_PREFIX_DEFAULT($HOME/ircd)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CONFIG_HEADER(include/setup.h)
|
||||
AC_CONFIG_SUBDIRS([libratbox])
|
||||
AC_CONFIG_SUBDIRS([librb])
|
||||
AC_CONFIG_AUX_DIR([libltdl/config])
|
||||
|
||||
AM_INIT_AUTOMAKE([subdir-objects])
|
||||
|
|
|
@ -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 += -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
|
||||
|
||||
|
|
|
@ -3,8 +3,8 @@ AUTOMAKE_OPTIONS = foreign
|
|||
prefix = @prefix@
|
||||
libircddir = @libdir@
|
||||
|
||||
AM_CPPFLAGS = @LTDLINCL@ -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include
|
||||
AM_LDFLAGS = -L$(top_srcdir)/libratbox/src -export-dynamic -avoid-version -no-undefined
|
||||
AM_CPPFLAGS = @LTDLINCL@ -I$(top_srcdir)/include -I$(top_srcdir)/librb/include
|
||||
AM_LDFLAGS = -L$(top_srcdir)/librb/src -export-dynamic -avoid-version -no-undefined
|
||||
AM_YFLAGS = -d
|
||||
|
||||
BUILT_SOURCES = version.c
|
||||
|
@ -66,13 +66,13 @@ libircd_la_SOURCES = \
|
|||
version.c \
|
||||
whowas.c
|
||||
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
|
||||
|
||||
bin_PROGRAMS = charybdis
|
||||
charybdis_SOURCES = main.c
|
||||
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
|
||||
$(RM) -f version.c
|
||||
|
|
|
@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = foreign
|
|||
SUBDIRS = src
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libratbox.pc
|
||||
pkgconfig_DATA = librb.pc
|
0
libratbox/aclocal.m4 → librb/aclocal.m4
vendored
0
libratbox/aclocal.m4 → librb/aclocal.m4
vendored
0
libratbox/config.guess → librb/config.guess
vendored
0
libratbox/config.guess → librb/config.guess
vendored
0
libratbox/config.sub → librb/config.sub
vendored
0
libratbox/config.sub → librb/config.sub
vendored
4
libratbox/configure → librb/configure
vendored
4
libratbox/configure → librb/configure
vendored
|
@ -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
|
||||
|
@ -16523,7 +16523,7 @@ do
|
|||
"include/librb-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/librb-config.h" ;;
|
||||
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/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;;
|
||||
esac
|
|
@ -670,7 +670,7 @@ fi
|
|||
AC_CONFIG_FILES( \
|
||||
src/Makefile \
|
||||
Makefile \
|
||||
libratbox.pc
|
||||
librb.pc
|
||||
)
|
||||
|
||||
AC_OUTPUT
|
|
@ -4,11 +4,11 @@ datarootdir=@datarootdir@
|
|||
data_dir=@datadir@/@PACKAGE_NAME@
|
||||
|
||||
version=@PACKAGE_VERSION@
|
||||
include_dir=@includedir@/libratbox
|
||||
include_dir=@includedir@/librb
|
||||
lib_dir=@libdir@
|
||||
|
||||
Name: libratbox
|
||||
Description: Portable runtime for ircd-ratbox and other things
|
||||
Name: librb
|
||||
Description: Portable runtime for charybdis and other things, based on libratbox
|
||||
Version: @PACKAGE_VERSION@
|
||||
Libs: -L${lib_dir} -lratbox
|
||||
Libs: -L${lib_dir} -lrb
|
||||
Cflags: -I${include_dir}
|
|
@ -13,7 +13,7 @@ version.c: version.c.SH ../CREDITS
|
|||
version.lo: version.c ../include/serno.h
|
||||
$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
|
||||
|
||||
libratbox_la_SOURCES = \
|
||||
librb_la_SOURCES = \
|
||||
unix.c \
|
||||
win32.c \
|
||||
crypt.c \
|
||||
|
@ -41,6 +41,6 @@ libratbox_la_SOURCES = \
|
|||
arc4random.c \
|
||||
version.c
|
||||
|
||||
libratbox_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@
|
||||
lib_LTLIBRARIES = libratbox.la
|
||||
librb_la_LDFLAGS = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt
|
||||
librb_la_LIBADD = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@
|
||||
lib_LTLIBRARIES = librb.la
|
|
@ -1,9 +1,9 @@
|
|||
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 += -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
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
pkglibexec_PROGRAMS = ssld
|
||||
AM_CFLAGS=$(WARNFLAGS)
|
||||
AM_CPPFLAGS = -I../include -I../libratbox/include
|
||||
AM_CPPFLAGS = -I../include -I../librb/include
|
||||
|
||||
|
||||
ssld_SOURCES = ssld.c
|
||||
ssld_LDADD = ../libratbox/src/libratbox.la @ZLIB_LD@
|
||||
ssld_LDADD = ../librb/src/librb.la @ZLIB_LD@
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
bin_PROGRAMS = charybdis-mkpasswd
|
||||
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_LDADD = ../libratbox/src/libratbox.la
|
||||
charybdis_mkpasswd_LDADD = ../librb/src/librb.la
|
||||
|
|
Loading…
Reference in a new issue