do not use libtool

diff --git a/Makefile.am b/Makefile.am
index 4cdb70e..d87e63f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = lib main data po
+SUBDIRS = lib main data po tools
 
 installdir = $(LIBDIR)/enigma2/python
 

diff --git a/configure.ac b/configure.ac
index 38a3aba..5dc22f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,6 @@ TUXBOX_APPS_DIRECTORY
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
-AM_PROG_LIBTOOL
 
 AC_ARG_WITH(libsdl,
        AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]),
@@ -90,4 +89,5 @@ po/Makefile
 main/Makefile
 tools/Makefile
 ])
+
 #lib/python/Plugins/Extensions/SimpleRSS/Makefile

diff --git a/tools/Makefile.am b/tools/Makefile.am
index ff74357..361b0b4 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,7 @@
-lib_LTLIBRARIES = libopen.la
+libopen: 
+       $(CXX) -Wall -W libopen.c -O2 -nostartfiles -shared -fPIC -Wl,-soname,libopen.so.0 -o libopen.so.0.0 -ldl
 
-libopen_la_SOURCES = libopen.c
+all: libopen
 
-install-exec-local:
-$(LIBTOOL) --mode=install install libopen.la $(DESTDIR)/usr/lib
\ No newline at end of file
+install:
+       $(INSTALL) libopen.so.0.0 $(DEST)/usr/lib

diff --git a/tools/libopen.c b/tools/libopen.c
index 8725f55..b3b5dce 100644 (file)
--- a/tools/libopen.c
+++ b/tools/libopen.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -11,7 +10,8 @@
 
 int open64(const char *pathname, int flags, ...)
 {
-       static int (*libc_open64) (const char* pathname, int flags, ...);
+       typedef int (*FUNC_PTR) (const char* pathname, int flags, ...);
+       static FUNC_PTR libc_open64;
        int fd=-1;
        if (!libc_open64)
        {
@@ -23,7 +23,7 @@ int open64(const char *pathname, int flags, ...)
                        fputs(dlerror(), stderr);
                        exit(1);
                }
-               libc_open64 = dlsym(handle, "open64");
+               libc_open64 = (FUNC_PTR) dlsym(handle, "open64");
                if ((error = dlerror()) != NULL) {
                        fprintf(stderr, "%s\n", error);
                        exit(1);
@@ -47,7 +47,8 @@ int open64(const char *pathname, int flags, ...)
 
 int open(const char *pathname, int flags, ...)
 {
-       static int (*libc_open) (const char* pathname, int flags, ...);
+       typedef int (*FUNC_PTR) (const char* pathname, int flags, ...);
+       static FUNC_PTR libc_open;
        int fd=-1;
        if (!libc_open)
        {
@@ -59,7 +60,7 @@ int open(const char *pathname, int flags, ...)
                        fputs(dlerror(), stderr);
                        exit(1);
                }
-               libc_open = dlsym(handle, "open");
+               libc_open = (FUNC_PTR) dlsym(handle, "open");
                if ((error = dlerror()) != NULL) {
                        fprintf(stderr, "%s\n", error);
                        exit(1);
@@ -83,7 +84,8 @@ int open(const char *pathname, int flags, ...)
 
 FILE *fopen64(const char *pathname, const char *mode)
 {
-       static FILE *(*libc_fopen64) (const char* pathname, const char *mode);
+       typedef FILE *(*FUNC_PTR) (const char* pathname, const char *mode);
+       static FUNC_PTR libc_fopen64;
        FILE *f=0;
        if (!libc_fopen64)
        {
@@ -95,7 +97,7 @@ FILE *fopen64(const char *pathname, const char *mode)
                        fputs(dlerror(), stderr);
                        exit(1);
                }
-               libc_fopen64 = dlsym(handle, "fopen64");
+               libc_fopen64 = (FUNC_PTR) dlsym(handle, "fopen64");
                if ((error = dlerror()) != NULL) {
                        fprintf(stderr, "%s\n", error);
                        exit(1);
@@ -120,7 +122,8 @@ FILE *fopen64(const char *pathname, const char *mode)
 
 FILE *fopen(const char *pathname, const char *mode)
 {
-       static FILE *(*libc_fopen) (const char* pathname, const char *mode);
+       typedef FILE *(*FUNC_PTR) (const char* pathname, const char *mode);
+       static FUNC_PTR libc_fopen;
        FILE *f=0;
        if (!libc_fopen)
        {
@@ -132,7 +135,7 @@ FILE *fopen(const char *pathname, const char *mode)
                        fputs(dlerror(), stderr);
                        exit(1);
                }
-               libc_fopen = dlsym(handle, "fopen");
+               libc_fopen = (FUNC_PTR) dlsym(handle, "fopen");
                if ((error = dlerror()) != NULL) {
                        fprintf(stderr, "%s\n", error);
                        exit(1);
@@ -157,7 +160,8 @@ FILE *fopen(const char *pathname, const char *mode)
 
 int socket(int domain, int type, int protocol)
 {
-       static int (*libc_socket) (int domain, int type, int protocol);
+       typedef int (*FUNC_PTR) (int domain, int type, int protocol);
+       static FUNC_PTR libc_socket;
        int fd=-1;
        if (!libc_socket)
        {
@@ -169,7 +173,7 @@ int socket(int domain, int type, int protocol)
                        fputs(dlerror(), stderr);
                        exit(1);
                }
-               libc_socket = dlsym(handle, "socket");
+               libc_socket = (FUNC_PTR) dlsym(handle, "socket");
                if ((error = dlerror()) != NULL) {
                        fprintf(stderr, "%s\n", error);
                        exit(1);
@@ -193,7 +197,8 @@ int socket(int domain, int type, int protocol)
 
 int pipe(int modus[2])
 {
-       static int (*libc_pipe) (int modus[2]);
+       typedef int (*FUNC_PTR) (int modus[2]);
+       static FUNC_PTR libc_pipe;
        int ret=-1;
        if (!libc_pipe)
        {
@@ -205,7 +210,7 @@ int pipe(int modus[2])
                        fputs(dlerror(), stderr);
                        exit(1);
                }
-               libc_pipe = dlsym(handle, "pipe");
+               libc_pipe = (FUNC_PTR) dlsym(handle, "pipe");
                if ((error = dlerror()) != NULL) {
                        fprintf(stderr, "%s\n", error);
                        exit(1);