@@ -287,11 +287,16 @@ LIBS = libkcgi.a \
287287 libkcgijson.a \
288288 libkcgixml.a \
289289 libkcgiregress.a
290- SOLIBS = libkcgi.$(LINKER_SOSUFFIX ) .$(LIBVER ) \
291- libkcgihtml.$(LINKER_SOSUFFIX ) .$(LIBVER ) \
292- libkcgijson.$(LINKER_SOSUFFIX ) .$(LIBVER ) \
293- libkcgixml.$(LINKER_SOSUFFIX ) .$(LIBVER ) \
294- libkcgiregress.$(LINKER_SOSUFFIX ) .$(LIBVER )
290+ .if $(LINKER_SOSUFFIX) == "dylib"
291+ SOLIBVER = $(LIBVER ) .$(LINKER_SOSUFFIX )
292+ .else
293+ SOLIBVER = $(LINKER_SOSUFFIX ) .$(LIBVER )
294+ .endif
295+ SOLIBS = libkcgi.$(SOLIBVER ) \
296+ libkcgihtml.$(SOLIBVER ) \
297+ libkcgijson.$(SOLIBVER ) \
298+ libkcgixml.$(SOLIBVER ) \
299+ libkcgiregress.$(SOLIBVER )
295300CURL_LIBS_PKG != curl-config --libs 2>/dev/null || echo "-lcurl"
296301CURL_CFLAGS_PKG != curl-config --cflags 2>/dev/null || echo ""
297302LIBS_PKG != pkg-config --libs zlib 2>/dev/null || echo "-lz"
@@ -396,7 +401,7 @@ clean:
396401 rm -f sample samplepp samplepp.o sample-fcgi sample.o sample-fcgi.o kfcgi kfcgi.o
397402 rm -f $(SBLGS ) $(THTMLS ) extending01.html atom.xml
398403 rm -f $(LIBOBJS ) compats.o
399- rm -f $(LIBS ) * .$(LINKER_SOSUFFIX ) * .$(LINKER_SOSUFFIX ) . $( LIBVER )
404+ rm -f $(LIBS ) * .$(LINKER_SOSUFFIX ) * .$(SOLIBVER )
400405 rm -f kcgihtml.o kcgijson.o kcgixml.o kcgiregress.o regress/regress.o
401406 rm -f * .core
402407 rm -f $(REGRESS ) $(AFL ) regress/* .o
@@ -456,7 +461,7 @@ $(BIN): $(BIN).o libkcgi.a
456461libkcgi.a : $(LIBOBJS ) compats.o
457462 $(AR ) rs $@ $(LIBOBJS ) compats.o
458463
459- libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER ) : $(LIBOBJS ) compats.o
464+ libkcgi.$(SOLIBVER ) : $(LIBOBJS ) compats.o
460465 $(CC ) $(LINKER_SOFLAG ) -o $@ $(LIBOBJS ) compats.o $(LDFLAGS ) $(LDADD_MD5 ) \
461466 -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) $(LIBS_PKG )
462467 ln -sf $@ ` basename $@ .$( LIBVER) `
@@ -486,24 +491,24 @@ libkcgixml.a: kcgixml.o
486491libkcgiregress.a : kcgiregress.o
487492 $(AR ) rs $@ kcgiregress.o
488493
489- libkcgihtml.$(LINKER_SOSUFFIX ) . $( LIBVER ) : kcgihtml.o libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER )
494+ libkcgihtml.$(SOLIBVER ) : kcgihtml.o libkcgi.$(SOLIBVER )
490495 $(CC ) $(LINKER_SOFLAG ) -o $@ kcgihtml.o $(LDFLAGS ) \
491- -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER )
496+ -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) libkcgi.$(SOLIBVER )
492497 ln -sf $@ ` basename $@ .$( LIBVER) `
493498
494- libkcgijson.$(LINKER_SOSUFFIX ) . $( LIBVER ) : kcgijson.o libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER )
499+ libkcgijson.$(SOLIBVER ) : kcgijson.o libkcgi.$(SOLIBVER )
495500 $(CC ) $(LINKER_SOFLAG ) -o $@ kcgijson.o $(LDFLAGS ) \
496- -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER )
501+ -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) libkcgi.$(SOLIBVER )
497502 ln -sf $@ ` basename $@ .$( LIBVER) `
498503
499- libkcgixml.$(LINKER_SOSUFFIX ) . $( LIBVER ) : kcgixml.o libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER )
504+ libkcgixml.$(SOLIBVER ) : kcgixml.o libkcgi.$(SOLIBVER )
500505 $(CC ) $(LINKER_SOFLAG ) -o $@ kcgixml.o $(LDFLAGS ) \
501- -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER )
506+ -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) libkcgi.$(SOLIBVER )
502507 ln -sf $@ ` basename $@ .$( LIBVER) `
503508
504- libkcgiregress.$(LINKER_SOSUFFIX ) . $( LIBVER ) : kcgiregress.o libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER )
509+ libkcgiregress.$(SOLIBVER ) : kcgiregress.o libkcgi.$(SOLIBVER )
505510 $(CC ) $(LINKER_SOFLAG ) -o $@ kcgiregress.o $(LDFLAGS ) \
506- -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) libkcgi.$(LINKER_SOSUFFIX ) . $( LIBVER )
511+ -Wl,${LINKER_SONAME} ,$@ $(LDLIBS ) libkcgi.$(SOLIBVER )
507512 ln -sf $@ ` basename $@ .$( LIBVER) `
508513
509514# Sample programs.
0 commit comments