Browse Source

I wasn't building the libdl shared lib anymore. Make each lib install a
libfoo.so symlink as well as a libfoo.so.0 link, since gcc is currently
only looking for files ending in .so. wierd.
-Erik

Eric Andersen 23 years ago
parent
commit
a17d863945
4 changed files with 9 additions and 5 deletions
  1. 5 4
      ldso/libdl/Makefile
  2. 1 0
      libcrypt/Makefile
  3. 2 1
      libm/Makefile
  4. 1 0
      libutil/Makefile

+ 5 - 4
ldso/libdl/Makefile

@@ -34,15 +34,15 @@ OBJS=$(patsubst %.c,%.o, $(CSRC))
 
 CFLAGS += -DUSE_CACHE #-fPIC -D__PIC__ #-funroll-loops
 
-all: $(OBJS) $(LIBDL)
+all: $(OBJS) $(LIBDL) shared
 
 $(LIBDL): ar-target
 
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBDL) $(OBJS)
-	install -d $(TOPDIR)lib
-	rm -f $(TOPDIR)lib/$(LIBDL)
-	install -m 644 $(LIBDL) $(TOPDIR)lib
+	#install -d $(TOPDIR)lib
+	#rm -f $(TOPDIR)lib/$(LIBDL)
+	#install -m 644 $(LIBDL) $(TOPDIR)lib
 
 $(OBJS): %.o : %.c
 	$(TARGET_CC) -I../d-link -I../d-link/$(TARGET_ARCH) $(CFLAGS) -c $< -o $@
@@ -57,6 +57,7 @@ shared: all
 	install -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION)
 	install -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib;
+	(cd $(TOPDIR)lib; ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED)); 
 	(cd $(TOPDIR)lib; ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED).$(MAJOR_VERSION)); 
 
 clean:

+ 1 - 0
libcrypt/Makefile

@@ -54,6 +54,7 @@ shared: all
 	install -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION)
 	install -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib;
+	(cd $(TOPDIR)lib; ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED)); 
 	(cd $(TOPDIR)lib; ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED).$(MAJOR_VERSION)); 
 
 clean: 

+ 2 - 1
libm/Makefile

@@ -52,13 +52,14 @@ tags:
 	ctags -R
 	
 shared: all
-	@if [ -f $(LIBM) ] ; then \
+	if [ -f $(LIBM) ] ; then \
 		$(TARGET_CC) $(LDFLAGS) -shared -o $(LIBM_SHARED_FULLNAME) \
 		    -Wl,-soname,$(LIBM_SHARED).$(MAJOR_VERSION) -Wl,--whole-archive \
 		    $(LIBM) $(TOPDIR)lib/$(SHARED_FULLNAME); \
 		install -d $(TOPDIR)lib; \
 		rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
 		install -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
+		(cd $(TOPDIR)lib; ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \
 		(cd $(TOPDIR)lib; ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \
 	fi;
 

+ 1 - 0
libutil/Makefile

@@ -53,6 +53,7 @@ shared: all
 	install -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION)
 	install -m 644 $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/;
+	(cd $(TOPDIR)lib; ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED)); 
 	(cd $(TOPDIR)lib; ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED).$(MAJOR_VERSION)); 
 
 clean: