[aadk-commits] qwell: branch uClinux/upstreamsync r306 - /uClinux/branches/upstreamsync/uCli...

[aadk-commits at lists.digium.com]

Author: qwell
Date: Mon Apr  2 17:39:10 2007
New Revision: 306

URL: http://svn.digium.com/view/aadk?view=rev&rev=306
Log:
Enable building of shared modules in libtonezone

Modified:
    uClinux/branches/upstreamsync/uClinux-dist/lib/libtonezone/Makefile

Modified: uClinux/branches/upstreamsync/uClinux-dist/lib/libtonezone/Makefile
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/lib/libtonezone/Makefile?view=diff&rev=306&r1=305&r2=306
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/lib/libtonezone/Makefile (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/lib/libtonezone/Makefile Mon Apr  2 17:39:10 2007
@@ -19,6 +19,8 @@
 TOPDIR=../
 # include $(TOPDIR)Rules.mak
 INSTALL=install
+
+LDSHARED=$(CC) $(LDFLAGS) -shared
 
 LIBTONEZONE=libtonezone.a
 LIBTONEZONE_SHARED=libtonezone.so
@@ -42,18 +44,29 @@
 #***
 
 
-all: $(OBJS) $(LIBTONEZONE) #$(LIBTONEZONE_SHARED)
+all: $(OBJS) $(LIBTONEZONE) $(LIBTONEZONE_SHARED)
+	install -d $(STAGEDIR)/usr/lib
+	install -m0644 $(LIBTONEZONE) $(STAGEDIR)/usr/lib
+ifeq ($(CONFIG_FMT_USE_FDPIC_ELF),y)
+	cp -a $(LIBTONEZONE_SHARED) $(STAGEDIR)/usr/lib
+endif
+	install -d $(STAGEDIR)/usr/include/zaptel
+	install -m0644 tonezone.h $(STAGEDIR)/usr/include/zaptel
+
 
 $(LIBTONEZONE): ar-target
 
-$(LIBTONEZONE_SHARED): $(LIBTONEZONE)
-	$(CC) -mfdpic -shared -Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc \
-	-Wl,-soname=libtonezone.so.1 \
-        -o libtonezone.so.1.0.1.0 -Wl,--whole-archive libtonezone.a \
-        -Wl,--no-whole-archive ../uClibc/libc/misc/internals/interp.o \
-        -L../lib
-	ln -sf libtonezone.so.1.0.1.0 libtonezone.so.1
-	ln -sf libtonezone.so.1 libtonezone.so
+$(LIBTONEZONE_SHARED): $(OBJS)
+	$(LDSHARED) -Wl,-soname,$(LIBTONEZONE_SHARED) -o $@ $(OBJS)
+
+#$(LIBTONEZONE_SHARED): $(LIBTONEZONE)
+#	$(CC) -mfdpic -shared -Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc \
+#	-Wl,-soname=libtonezone.so.1 \
+#        -o libtonezone.so.1.0.1.0 -Wl,--whole-archive libtonezone.a \
+#        -Wl,--no-whole-archive ../uClibc/libc/misc/internals/interp.o \
+#        -L../lib
+#	ln -sf libtonezone.so.1.0.1.0 libtonezone.so.1
+#	ln -sf libtonezone.so.1 libtonezone.so
 
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBTONEZONE) $(OBJS)
@@ -70,10 +83,9 @@
 $(OBJ): Makefile
 
 romfs: all
-	[ -d $(ROMFSDIR)/lib ] || mkdir -p $(ROMFSDIR)/lib ; \
-	$(ROMFSINST) libtonezone.so.1 /lib/libtonezone.so.1 ; \
-	( cd $(ROMFSDIR)/lib ; ln -sf libtonezone.so.1 libtonezone.so ) \
-#	$(ROMFSINST) libtonezone.so /lib/libtonezone.so ; \
+ifeq ($(CONFIG_FMT_USE_FDPIC_ELF),y)
+	$(ROMFSINST) $(LIBTONEZONE_SHARED) /lib
+endif
 
 
 shared: all