shared library fixes
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1670 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -23,7 +23,6 @@ exec_prefix = @exec_prefix@
|
||||
libdir = @libdir@
|
||||
|
||||
PICFLAGS = @REAL_PICFLAGS@
|
||||
SHARED = @SHARED@
|
||||
LDSHARED = @LDSHARED@
|
||||
SHLIBEXT = @REAL_SHLIBEXT@
|
||||
LD_FLAGS = @REAL_LD_FLAGS@
|
||||
@@ -76,4 +75,4 @@ $(OBJECTS): ../../../include/config.h
|
||||
|
||||
$(LIB): $(OBJECTS)
|
||||
rm -f $@
|
||||
$(LDSHARED) $(SHARED) -o $@ $(OBJECTS) -rpath,$(libdir) -L../../kafs -lkafs -L../../krb -lkrb -L../../des -ldes -L../../roken -lroken
|
||||
$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -lkafs -L../../krb -lkrb -L../../des -ldes -L../../roken -lroken
|
||||
|
@@ -22,7 +22,6 @@ exec_prefix = @exec_prefix@
|
||||
libdir = @libdir@
|
||||
|
||||
PICFLAGS = @REAL_PICFLAGS@
|
||||
SHARED = @SHARED@
|
||||
LDSHARED = @LDSHARED@
|
||||
SHLIBEXT = @REAL_SHLIBEXT@
|
||||
LD_FLAGS = @REAL_LD_FLAGS@
|
||||
@@ -76,5 +75,5 @@ $(OBJECTS): ../../../include/config.h
|
||||
|
||||
$(LIB): $(OBJECTS)
|
||||
rm -f $@
|
||||
$(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -L../../krb -L../../des -L../../roken -lkafs -lkrb -ldes -lroken
|
||||
$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -L../../krb -L../../des -L../../roken -lkafs -lkrb -ldes -lroken
|
||||
# $(CC) -shared -Wl,-x -o $(LIB) $(OBJECTS) ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
|
||||
|
@@ -39,7 +39,6 @@ LIBNAME = $(LIBPREFIX)des
|
||||
LIBEXT = @LIBEXT@
|
||||
LIBPREFIX = @LIBPREFIX@
|
||||
SHLIBEXT = @SHLIBEXT@
|
||||
SHARED = @SHARED@
|
||||
LIB = $(LIBNAME).$(LIBEXT)
|
||||
|
||||
# Generated with lorder *.o | tsort | xargs echo
|
||||
@@ -107,7 +106,7 @@ $(LIBNAME).a: $(LIBOBJ)
|
||||
|
||||
$(LIBNAME).$(SHLIBEXT): $(LIBOBJ)
|
||||
rm -f $@
|
||||
$(LDSHARED) $(SHARED) -o $@ $(LIBOBJ)
|
||||
$(LDSHARED) -o $@ $(LIBOBJ)
|
||||
|
||||
# To make psoriaris make happy we have to mention these files in some
|
||||
# rule, so we might as well put them here.
|
||||
|
@@ -27,7 +27,6 @@ LIBNAME = $(LIBPREFIX)editline
|
||||
LIBEXT = @LIBEXT@
|
||||
SHLIBEXT = @SHLIBEXT@
|
||||
LIBPREFIX = @LIBPREFIX@
|
||||
SHARED = @SHARED@
|
||||
LDSHARED = @LDSHARED@
|
||||
LIB = $(LIBNAME).$(LIBEXT)
|
||||
|
||||
@@ -79,6 +78,6 @@ $(LIBNAME).a: $(OBJECTS)
|
||||
|
||||
$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
|
||||
rm -f $@
|
||||
$(LDSHARED) $(SHARED) -o $@ $(OBJECTS)
|
||||
$(LDSHARED) -o $@ $(OBJECTS)
|
||||
|
||||
$(OBJECTS): ../../include/config.h
|
||||
|
@@ -27,7 +27,6 @@ LIBNAME = $(LIBPREFIX)kafs
|
||||
LIBEXT = @LIBEXT@
|
||||
SHLIBEXT = @SHLIBEXT@
|
||||
LIBPREFIX = @LIBPREFIX@
|
||||
SHARED = @SHARED@
|
||||
LDSHARED = @LDSHARED@
|
||||
AFS_EXTRA_LIBS = @AFS_EXTRA_LIBS@
|
||||
LIB = $(LIBNAME).$(LIBEXT) $(AFS_EXTRA_LIBS)
|
||||
@@ -81,7 +80,7 @@ $(LIBNAME).a: $(OBJECTS) @AFS_EXTRA_OBJS@
|
||||
|
||||
$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
|
||||
rm -f $@
|
||||
$(LDSHARED) $(SHARED) -o $@ $(OBJECTS)
|
||||
$(LDSHARED) -o $@ $(OBJECTS)
|
||||
|
||||
# AIX: this almost works with gcc, but somehow it fails to use the
|
||||
# correct ld, use ld instead
|
||||
|
@@ -29,7 +29,6 @@ LIBNAME = $(LIBPREFIX)otp
|
||||
LIBEXT = @LIBEXT@
|
||||
SHLIBEXT = @SHLIBEXT@
|
||||
LIBPREFIX = @LIBPREFIX@
|
||||
SHARED = @SHARED@
|
||||
LDSHARED = @LDSHARED@
|
||||
EXECSUFFIX=@EXECSUFFIX@
|
||||
LIB = $(LIBNAME).$(LIBEXT)
|
||||
@@ -92,7 +91,7 @@ $(LIBNAME).a: $(LIB_OBJECTS)
|
||||
|
||||
$(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
|
||||
rm -f $@
|
||||
$(LDSHARED) $(SHARED) -o $@ $(LIB_OBJECTS)
|
||||
$(LDSHARED) -o $@ $(LIB_OBJECTS)
|
||||
|
||||
$(OBJECTS): ../../include/config.h
|
||||
|
||||
|
@@ -29,7 +29,7 @@ LIBNAME = $(LIBPREFIX)roken
|
||||
LIBEXT = a
|
||||
LIBPREFIX = @LIBPREFIX@
|
||||
SHLIBEXT = @SHLIBEXT@
|
||||
SHARED = @SHARED@
|
||||
LDSHARED = @LDSHARED@
|
||||
LIB = $(LIBNAME).$(LIBEXT)
|
||||
|
||||
SOURCES = \
|
||||
@@ -89,6 +89,6 @@ $(LIBNAME).a: $(OBJECTS)
|
||||
|
||||
$(LIBNAME).$(SHLIBEXT): $(OBJECTS)
|
||||
rm -f $@
|
||||
$(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(OBJECTS)
|
||||
$(LDSHARED) -o $@ $(OBJECTS)
|
||||
|
||||
$(OBJECTS): ../../include/config.h
|
||||
|
@@ -27,7 +27,6 @@ LIBNAME = $(LIBPREFIX)sl
|
||||
LIBEXT = @LIBEXT@
|
||||
SHLIBEXT = @SHLIBEXT@
|
||||
LIBPREFIX = @LIBPREFIX@
|
||||
SHARED = @SHARED@
|
||||
LDSHARED = @LDSHARED@
|
||||
LIB = $(LIBNAME).$(LIBEXT)
|
||||
PROGS =
|
||||
@@ -78,7 +77,7 @@ $(LIBNAME).a: $(LIB_OBJECTS)
|
||||
|
||||
$(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
|
||||
rm -f $@
|
||||
$(LDSHARED) $(SHARED) -o $@ $(LIB_OBJECTS)
|
||||
$(LDSHARED) -o $@ $(LIB_OBJECTS)
|
||||
|
||||
$(OBJECTS): ../../include/config.h
|
||||
|
||||
|
Reference in New Issue
Block a user