diff -Naur mISDNuser/i4lnet/Makefile mISDNuser.oden/i4lnet/Makefile --- mISDNuser/i4lnet/Makefile 2006-10-18 14:32:20.000000000 +0200 +++ mISDNuser.oden/i4lnet/Makefile 2006-10-23 19:26:48.000000000 +0200 @@ -22,8 +22,9 @@ $(AR) cru $@ $^ $(RANLIB) $@ -libisdnnet.so: $(ISDNNET_OBJ) - $(CC) -shared -Xlinker -x -o $@ $^ +libisdnnet.so: $(ISDNNET_PICOBJ) + $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -Wl,-soname,libisdnnet.so.0 -shared -o libisdnnet.so.0 \ + $(ISDNNET_PICOBJ) ../lib/libmISDN.so.0 -pthread .c.o: $(CC) $(CFLAGS) -o $@ -c $< diff -Naur mISDNuser/include/mISDNlib.h mISDNuser.oden/include/mISDNlib.h --- mISDNuser/include/mISDNlib.h 2006-08-15 18:29:13.000000000 +0200 +++ mISDNuser.oden/include/mISDNlib.h 2006-10-23 19:26:05.000000000 +0200 @@ -18,7 +18,7 @@ #include <sys/types.h> #include <stdio.h> -#include "linux/mISDNif.h" +#include "mISDNif.h" #define mISDN_INBUFFER_SIZE 0x20000 diff -Naur mISDNuser/lib/Makefile mISDNuser.oden/lib/Makefile --- mISDNuser/lib/Makefile 2006-10-18 09:10:23.000000000 +0200 +++ mISDNuser.oden/lib/Makefile 2006-10-23 19:27:08.000000000 +0200 @@ -20,8 +20,9 @@ $(AR) cru $@ $^ $(RANLIB) $@ -libmISDN.so: $(LIBMISDN_OBJS) - $(CC) -shared -Xlinker -x -o $@ $^ +libmISDN.so: $(LIBMISDN_PICOBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -Wl,-soname,libmISDN.so.0 -shared -o libmISDN.so.0 \ + $(LIBMISDN_PICOBJS) .c.o: $(CC) $(CFLAGS) -o $@ -c $< diff -Naur mISDNuser/Makefile mISDNuser.oden/Makefile --- mISDNuser/Makefile 2006-10-19 23:04:02.000000000 +0200 +++ mISDNuser.oden/Makefile 2006-10-23 19:26:05.000000000 +0200 @@ -1,9 +1,3 @@ -# -# Set this to your local copy of mISDN -# -MISDNDIR := /usr/src/mqueue/mISDN - - PWD=$(shell pwd) # # Change this to create an install prefix for the shared libs, programms and @@ -12,9 +6,6 @@ INSTALL_PREFIX := / export INSTALL_PREFIX -MISDNINCLUDEDIR := $(MISDNDIR)/include -export MISDNINCLUDEDIR - mISDN_DIR := $(PWD) export mISDN_DIR @@ -24,25 +15,24 @@ LIBDIR=/usr/lib export LIBDIR -CFLAGS:= -g -Wall -O2 -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR) -CFLAGS+= -D CLOSE_REPORT=1 +CFLAGS:= $(RPM_OPT_FLAGS) -fPIC -I$(INCLUDEDIR) +CFLAGS+= -DCLOSE_REPORT=1 export CFLAGS -mISDNLIB := $(PWD)/lib/libmISDN.a -mISDNNETLIB := $(PWD)/i4lnet/libmisdnnet.a +mISDNLIB := $(PWD)/lib/libmISDN.so $(PWD)/lib/libmISDN.a +mISDNNETLIB := $(PWD)/i4lnet/libmisdnnet.so $(PWD)/i4lnet/libmisdnnet.a export mISDNLIB export mISDNNETLIB -SUBDIRS := lib example +SUBDIRS := lib SUBDIRS += $(shell if test -d i4lnet ; then echo i4lnet; fi) SUBDIRS += $(shell if test -d tenovis ; then echo tenovis; fi) -SUBDIRS += $(shell if test -d voip ; then echo voip; fi) SUBDIRS += $(shell if test -d suppserv ; then echo suppserv; fi) -LIBS := lib/libmISDN.a +LIBS := lib/libmISDN.so lib/libmISDN.a -all: test_misdn_includes +all: $(MAKE) TARGET=$@ subdirs @@ -95,8 +85,3 @@ voiparchiv: ARCHIVNAME := $(ARCHIVDIR)/$(MAINDIR)_voip-$(VERSION).tar.bz2 voiparchiv: archiv - -test_misdn_includes: - @if ! echo "#include <linux/mISDNif.h>" | gcc -I$(MISDNINCLUDEDIR) -C -E - >/dev/null ; then echo -e "\n\nYou either don't seem to have installed mISDN properly\nor you haven't set the MISDNDIR variable in this very Makefile.\n\nPlease either install mISDN or set the MISDNDIR properly\n"; exit 1; fi - - diff -Naur mISDNuser/suppserv/Makefile mISDNuser.oden/suppserv/Makefile --- mISDNuser/suppserv/Makefile 2006-10-18 14:32:21.000000000 +0200 +++ mISDNuser.oden/suppserv/Makefile 2006-10-23 19:27:22.000000000 +0200 @@ -25,9 +25,9 @@ $(AR) cru $@ $< $(RANLIB) $@ -libsuppserv.so: $(SUPPSERV_OBJ) - $(CC) -shared -Xlinker -x -o $@ $^ - +libsuppserv.so: $(SUPPSERV_PICOBJ) + $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -Wl,-soname,libsuppserv.so.0 -shared -o libsuppserv.so.0 \ + $(SUPPSERV_PICOBJ) .c.o: $(CC) $(CFLAGS) -o $@ -c $< diff -Naur mISDNuser/tenovis/lib/Makefile mISDNuser.oden/tenovis/lib/Makefile --- mISDNuser/tenovis/lib/Makefile 2006-03-06 14:08:29.000000000 +0100 +++ mISDNuser.oden/tenovis/lib/Makefile 2006-10-23 19:26:05.000000000 +0200 @@ -1,11 +1,15 @@ -lib: libtenovis.a +lib: libtenovis.so libtenovis.a libtenovis.a: tenovis_device.o tenovis_intern.o rm -f $@ ar -r $@ $^ ar -s $@ +libtenovis.so: tenovis_device.o tenovis_intern.o + $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -Wl,-soname,libtenovis.so.0 -shared -o \ + libtenovis.so.0 tenovis_device.o tenovis_intern.o ../../lib/libmISDN.so.0 + tenovis_device.o : tenovis_device.c tenovis.h tenovis_int.h \ ../../include/mISDNlib.h diff -Naur mISDNuser/tenovis/Makefile mISDNuser.oden/tenovis/Makefile --- mISDNuser/tenovis/Makefile 2006-03-06 14:08:29.000000000 +0100 +++ mISDNuser.oden/tenovis/Makefile 2006-10-23 19:26:05.000000000 +0200 @@ -1,6 +1,6 @@ LIBINCL := $(INCLUDEDIR)/mISDNlib.h -TENOVISLIB := lib/libtenovis.a +TENOVISLIB := lib/libtenovis.so lib/libtenovis.a TENOVISINC := lib/tenovis.h @@ -8,7 +8,7 @@ PROGS := testlib tstlib -all: sublib $(PROGS) +all: sublib install: for i in $(PROGS) ; do \
