[beast/devel: 72/77] BIRNET: remove libbirnet
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast/devel: 72/77] BIRNET: remove libbirnet
- Date: Wed, 1 May 2013 17:33:23 +0000 (UTC)
commit e04334ec90e568d931a90777e737558f4bf9fb22
Author: Tim Janik <timj gnu org>
Date: Sun Apr 14 19:53:11 2013 +0200
BIRNET: remove libbirnet
beast-gtk/gxk/Makefile.am | 3 +-
birnet/.gitignore | 4 -
birnet/Makefile.am | 101 +---------
birnet/birnet-zintern.cc | 6 +-
birnet/birnet.hh | 13 --
birnet/birnetcdefs.h | 216 -------------------
birnet/birnetutils.cc | 504 ---------------------------------------------
birnet/birnetutils.hh | 90 --------
birnet/examples/mkhost.sh | 370 ---------------------------------
birnet/tests/.gitignore | 9 -
birnet/tests/Makefile.am | 2 +-
bse/Makefile.am | 2 +-
sfi/Makefile.am | 2 +-
sfi/tests/Makefile.am | 4 +-
14 files changed, 10 insertions(+), 1316 deletions(-)
---
diff --git a/beast-gtk/gxk/Makefile.am b/beast-gtk/gxk/Makefile.am
index adf3bf6..6193624 100644
--- a/beast-gtk/gxk/Makefile.am
+++ b/beast-gtk/gxk/Makefile.am
@@ -114,8 +114,7 @@ noinst_PROGRAMS = $(ALLTESTS)
progs_LDADD = $(strip \
libgxk.a $(GXK_LIBS) \
$(top_builddir)/sfi/libsfi.o $(SFI_LIBS) \
- $(RAPICORN_LIBS) \
- $(top_builddir)/birnet/libbirnet.o $(BIRNET_LIBS) \
+ $(RAPICORN_LIBS) $(BIRNET_LIBS) \
)
diff --git a/birnet/Makefile.am b/birnet/Makefile.am
index c406fdb..9ded676 100644
--- a/birnet/Makefile.am
+++ b/birnet/Makefile.am
@@ -8,112 +8,13 @@ AM_CXXFLAGS = $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE $(BIRNET_CFLAGS)
GLIB_MKENUMS = glib-mkenums
birnet_headers = $(strip \
- birnet.hh \
birnetcdefs.h \
birnetutils.hh \
)
-birnet_sources = $(strip \
- birnetutils.cc \
-)
-birnet_private_headers = $(strip \
-)
-birnet_generated_headers = $(strip \
- birnetconfig.h \
-)
EXTRA_DIST += configure.inc acbirnet.m4
-# Birnet library
-# we want a partial shared library here. libtool creates that if the library
-# name ends in .lo or .o. however automake doesn't know .lo or .o libraries,
-# so we simply build an ordinary non-installed .la library and then use our
-# own rule to build the .o from the .la pieces.
-noinst_LTLIBRARIES = libbirnet.la
-libbirnetincludedir = $(includedir)/birnet
-libbirnetinclude_HEADERS = $(birnet_headers) $(birnet_generated_headers)
-libbirnet_la_SOURCES = $(birnet_sources)
-libbirnet_la_DEPENDENCIES =
-libbirnet_la_LIBADD = $(RAPICORN_LIBS) $(BIRNET_LIBS) -lm
-libbirnet_la_LDFLAGS = -no-undefined # -Wl,-Bsymbolic
-# keep this .o rule in sync with the corresponding .la rule from Makefile.in
-libbirnet.o: $(libbirnet_la_OBJECTS) $(libbirnet_la_DEPENDENCIES)
- $(CXXLINK) $(libbirnet_la_LDFLAGS) $(libbirnet_la_OBJECTS) # $(libbirnet_la_LIBADD) $(LIBS)
-all-am: libbirnet.o
-CLEANFILES += libbirnet.lo libbirnet.o
-EXTRA_DIST += $(birnet_private_headers)
-
-# === birnetconfig.h ===
-birnetconfig.h: $(top_builddir)/config.status # Makefile
- cd . \
- && echo "/* Generated data from $< (by make $@) */" > xgen-$(@F)
\
- && echo "" >> xgen-$(@F)
\
- && echo "/* select programming environment */" >> xgen-$(@F)
\
- && echo "#ifndef _GNU_SOURCE" >> xgen-$(@F)
\
- && echo "#define _GNU_SOURCE" >> xgen-$(@F)
\
- && echo "#endif" >> xgen-$(@F)
\
- && echo "" >> xgen-$(@F)
\
- && echo "/* standard C code wrappers */" >> xgen-$(@F)
\
- && echo "#ifdef __cplusplus" >> xgen-$(@F)
\
- && echo '#define BIRNET_EXTERN_C_BEGIN() extern "C" {' >> xgen-$(@F)
\
- && echo "#define BIRNET_EXTERN_C_END() }" >> xgen-$(@F)
\
- && echo "#else" >> xgen-$(@F)
\
- && echo "#define BIRNET_EXTERN_C_BEGIN()" >> xgen-$(@F)
\
- && echo "#define BIRNET_EXTERN_C_END()" >> xgen-$(@F)
\
- && echo "#endif" >> xgen-$(@F)
\
- && echo "" >> xgen-$(@F)
\
- && echo "/* birnet version */" >> xgen-$(@F)
\
- && echo "#define BIRNET_MAJOR_VERSION (@BIRNET_MAJOR_VERSION@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_MINOR_VERSION (@BIRNET_MINOR_VERSION@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_MICRO_VERSION (@BIRNET_MICRO_VERSION@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_BINARY_AGE (@BIRNET_BINARY_AGE@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_INTERFACE_AGE (@BIRNET_INTERFACE_AGE@)" >> xgen-$(@F)
\
- && echo "" >> xgen-$(@F)
\
- && echo "/* log domain */" >> xgen-$(@F)
\
- && echo "#ifndef BIRNET_LOG_DOMAIN" >> xgen-$(@F)
\
- && echo "#ifdef G_LOG_DOMAIN" >> xgen-$(@F)
\
- && echo "#define BIRNET_LOG_DOMAIN G_LOG_DOMAIN" >> xgen-$(@F)
\
- && echo "#else" >> xgen-$(@F)
\
- && echo "#define BIRNET_LOG_DOMAIN ((const char*) 0)" >> xgen-$(@F)
\
- && echo "#endif" >> xgen-$(@F)
\
- && echo "#endif" >> xgen-$(@F)
\
- && echo "" >> xgen-$(@F)
\
- && echo "/* version checks */" >> xgen-$(@F)
\
- && echo "#define BIRNET_CHECK_VERSION(major,minor,micro) \\" >> xgen-$(@F)
\
- && echo " (BIRNET_MAJOR_VERSION > (major) || \\" >> xgen-$(@F)
\
- && echo " (BIRNET_MAJOR_VERSION == (major) && BIRNET_MINOR_VERSION > (minor)) || \\" >> xgen-$(@F)
\
- && echo " (BIRNET_MAJOR_VERSION == (major) && BIRNET_MINOR_VERSION == (minor) && \\" >> xgen-$(@F)
\
- && echo " BIRNET_MICRO_VERSION >= (micro)))" >> xgen-$(@F)
\
- && echo "" >> xgen-$(@F)
\
- && echo "/* configure results */" >> xgen-$(@F)
\
- && echo "#define BIRNET_OS_ BIRNET_OS@ (1) /* one of: @BIRNET_OS_CHOICES@ */" >> xgen-$(@F)
\
- && echo "#define BIRNET_SIZEOF_POINTER (@BIRNET_SIZEOF_POINTER@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SIZEOF_LONG (@BIRNET_SIZEOF_LONG@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SIZEOF_SYS_TYPESH_UINT (@BIRNET_SIZEOF_SYS_TYPESH_UINT@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SIZEOF_PTH_MUTEX_T (@BIRNET_SIZEOF_PTH_MUTEX_T@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SIZEOF_PTH_COND_T (@BIRNET_SIZEOF_PTH_COND_T@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_HAVE_MUTEXATTR_SETTYPE (@BIRNET_HAVE_MUTEXATTR_SETTYPE@ && \\" >> xgen-$(@F)
\
- && echo " BIRNET_SIZEOF_PTH_MUTEX_T && \\" >> xgen-$(@F)
\
- && echo " BIRNET_SIZEOF_PTH_COND_T)" >> xgen-$(@F)
\
- && echo "#define BIRNET_MEMORY_BARRIER_NEEDED (@BIRNET_MEMORY_BARRIER_NEEDED@)" >> xgen-$(@F)
\
- && echo "" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLIN (@BIRNET_SYSVAL_POLLIN@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLPRI (@BIRNET_SYSVAL_POLLPRI@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLOUT (@BIRNET_SYSVAL_POLLOUT@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLRDNORM (@BIRNET_SYSVAL_POLLRDNORM@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLRDBAND (@BIRNET_SYSVAL_POLLRDBAND@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLWRNORM (@BIRNET_SYSVAL_POLLWRNORM@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLWRBAND (@BIRNET_SYSVAL_POLLWRBAND@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLERR (@BIRNET_SYSVAL_POLLERR@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLHUP (@BIRNET_SYSVAL_POLLHUP@)" >> xgen-$(@F)
\
- && echo "#define BIRNET_SYSVAL_POLLNVAL (@BIRNET_SYSVAL_POLLNVAL@)" >> xgen-$(@F)
\
- && echo "" >> xgen-$(@F)
\
- && echo "/* Generated data ends here */" >> xgen-$(@F)
\
- && cp xgen-$(@F) $@ \
- && rm -f xgen-$(@F)
-CLEANFILES += birnetconfig.h
-$(libbirnet_la_OBJECTS): birnetconfig.h
-
noinst_PROGRAMS = $(ALLTESTS)
-progs_ldadd = libbirnet.o $(BIRNET_LIBS) $(RAPICORN_LIBS) -lm
+progs_ldadd = $(BIRNET_LIBS) $(RAPICORN_LIBS) -lm
noinst_PROGRAMS += birnet-zintern
birnet_zintern_SOURCES = birnet-zintern.cc
diff --git a/birnet/birnet-zintern.cc b/birnet/birnet-zintern.cc
index 4a9a8ce..33f1ead 100644
--- a/birnet/birnet-zintern.cc
+++ b/birnet/birnet-zintern.cc
@@ -1,11 +1,12 @@
// Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include <birnet/birnet.hh>
+#include <rapicorn-core.hh>
#include <glib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <zlib.h>
-namespace Birnet {
+using namespace Rapicorn;
+
static bool use_compression = FALSE;
static bool use_base_name = FALSE;
typedef struct {
@@ -198,4 +199,3 @@ main (int argc,
}
return 0;
}
-} // Birnet
diff --git a/birnet/tests/Makefile.am b/birnet/tests/Makefile.am
index c5a4916..166586a 100644
--- a/birnet/tests/Makefile.am
+++ b/birnet/tests/Makefile.am
@@ -7,6 +7,6 @@ DEFS += @DEFINE__FILE_DIR__@ -DBIRNET_LOG_DOMAIN='"$(basename $(@F))"' -DPAR
AM_CXXFLAGS = $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE $(BIRNET_CFLAGS)
noinst_PROGRAMS = $(ALLTESTS)
-progs_ldadd = $(top_builddir)/birnet/libbirnet.o $(RAPICORN_LIBS) $(BIRNET_LIBS) -lm
+progs_ldadd = $(RAPICORN_LIBS) $(BIRNET_LIBS) -lm
TESTS =
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 98027a7..9b3c2c6 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -142,7 +142,7 @@ libbseincludedir = $(includedir)/bse
libbseinclude_HEADERS = $(bse_public_headers) bse.idl $(bse_idl_sources) bsehack.idl
$(idl_dummy_files)
nodist_libbseinclude_HEADERS = bsebasics.genidl.hh
libbse_la_SOURCES = $(bse_sources) $(bse_proc_gen_sources)
-libbse_la_LIBADD = $(top_builddir)/birnet/libbirnet.o $(top_builddir)/sfi/libsfi.o $(BSE_LIBS)
$(SFI_LIBS) $(RAPICORN_LIBS)
+libbse_la_LIBADD = $(top_builddir)/sfi/libsfi.o $(BSE_LIBS) $(SFI_LIBS) $(RAPICORN_LIBS)
libbse_la_LDFLAGS = $(strip \
-Wl,--version-script=$(srcdir)/ldscript.map \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index 9593882..85b5337 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -59,7 +59,7 @@ common_idl_sources = sfidl-generator.cc sfidl-namespace.cc sfidl-options.cc sfid
bin_PROGRAMS = sfidl
sfidl_SOURCES = sfidl.cc $(common_idl_sources)
-sfidl_LDADD = $(SFI_LIBS) -lm $(top_builddir)/birnet/libbirnet.o $(RAPICORN_LIBS)
+sfidl_LDADD = $(SFI_LIBS) $(RAPICORN_LIBS) -lm
EXTRA_DIST += sfidl-generator.hh sfidl-namespace.hh sfidl-options.hh sfidl-parser.hh sfidl-factory.hh
EXTRA_DIST += sfidl-cbase.hh sfidl-clientc.hh sfidl-clientcxx.hh sfidl-cxxbase.hh sfidl-hostc.hh
sfidl-utils.hh
diff --git a/sfi/tests/Makefile.am b/sfi/tests/Makefile.am
index 8a8d584..53311f3 100644
--- a/sfi/tests/Makefile.am
+++ b/sfi/tests/Makefile.am
@@ -7,8 +7,8 @@ DEFS += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID
AM_CXXFLAGS = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
noinst_PROGRAMS = $(ALLTESTS)
-progs_nosfi_ldadd = $(RAPICORN_LIBS) $(top_builddir)/birnet/libbirnet.o $(SFI_LIBS) -lm
-progs_ldadd = $(top_builddir)/sfi/libsfi.o $(RAPICORN_LIBS) $(top_builddir)/birnet/libbirnet.o
$(SFI_LIBS) -lm
+progs_nosfi_ldadd = $(RAPICORN_LIBS) $(SFI_LIBS) -lm
+progs_ldadd = $(top_builddir)/sfi/libsfi.o $(RAPICORN_LIBS) $(SFI_LIBS) -lm
SFIDL = $(top_builddir)/sfi/sfidl
# ring
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
