DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed target definitions for libraries with OBJDIR

Browse Source
This commit is contained in:
Pierre Pronchery 2014-11-12 00:56:26 +01:00
parent f5ba74891b
commit 0a26b49220
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/makefile.c
View File

@ -350,12 +350,12 @@ static int _variables_targets_library(Configure * configure, FILE * fp,
return 1; return 1;
if(configure->os == HO_MACOSX) if(configure->os == HO_MACOSX)
fprintf(fp, " %s%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", target, fprintf(fp, " %s%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", target,
".a $(OBJDIR)", soname, " ", target, ".0", ".a $(OBJDIR)", soname, " $(OBJDIR)", target,
soext, " ", target, soext); ".0", soext, " $(OBJDIR)", target, soext);
else else
fprintf(fp, " %s%s%s%s%s%s%s%s%s", "$(OBJDIR)", target, fprintf(fp, " %s%s%s%s%s%s%s%s%s", "$(OBJDIR)", target,
".a $(OBJDIR)", soname, ".0 ", soname, " ", ".a $(OBJDIR)", soname, ".0 $(OBJDIR)", soname,
target, soext); " $(OBJDIR)", target, soext);
string_delete(soname); string_delete(soname);
return 0; return 0;
} }
@ -1164,12 +1164,12 @@ static int _target_library(Configure * configure, FILE * fp,
return 1; return 1;
if(configure->os != HO_MACOSX) if(configure->os != HO_MACOSX)
fprintf(fp, "\n%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", soname, fprintf(fp, "\n%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", soname,
".0 ", soname, " ", target, soext, ": $(", ".0 $(OBJDIR)", soname, " $(OBJDIR)", target,
target, "_OBJS)"); soext, ": $(", target, "_OBJS)");
else else
fprintf(fp, "\n%s%s%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", soname, fprintf(fp, "\n%s%s%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", soname,
" ", target, ".0", soext, " ", target, soext, " $(OBJDIR)", target, ".0", soext, " $(OBJDIR)",
": $(", target, "_OBJS)"); target, soext, ": $(", target, "_OBJS)");
if((p = config_get(configure->config, target, "depends")) != NULL) if((p = config_get(configure->config, target, "depends")) != NULL)
fprintf(fp, " %s", p); fprintf(fp, " %s", p);
fputc('\n', fp); fputc('\n', fp);

4
tests/library/Makefile.Darwin
View File

@ -1,4 +1,4 @@
TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.0.0.dylib libtest.0.dylib libtest.dylib TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.0.0.dylib $(OBJDIR)libtest.0.dylib $(OBJDIR)libtest.dylib
OBJDIR = OBJDIR =
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
@ -22,7 +22,7 @@ $(OBJDIR)libtest.a: $(libtest_OBJS)
$(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS) $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
$(RANLIB) $(OBJDIR)libtest.a $(RANLIB) $(OBJDIR)libtest.a
$(OBJDIR)libtest.0.0.dylib libtest.0.dylib libtest.dylib: $(libtest_OBJS) $(OBJDIR)libtest.0.0.dylib $(OBJDIR)libtest.0.dylib $(OBJDIR)libtest.dylib: $(libtest_OBJS)
$(CCSHARED) -o $(OBJDIR)libtest.0.0.dylib -install_name $(LIBDIR)/libtest.0.dylib $(libtest_OBJS) $(libtest_LDFLAGS) $(CCSHARED) -o $(OBJDIR)libtest.0.0.dylib -install_name $(LIBDIR)/libtest.0.dylib $(libtest_OBJS) $(libtest_LDFLAGS)
$(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.0.dylib $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.0.dylib
$(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.dylib $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.dylib

4
tests/library/Makefile.NetBSD
View File

@ -1,4 +1,4 @@
TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.so.0.0 libtest.so.0 libtest.so TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.so.0.0 $(OBJDIR)libtest.so.0 $(OBJDIR)libtest.so
OBJDIR = OBJDIR =
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
@ -22,7 +22,7 @@ $(OBJDIR)libtest.a: $(libtest_OBJS)
$(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS) $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
$(RANLIB) $(OBJDIR)libtest.a $(RANLIB) $(OBJDIR)libtest.a
$(OBJDIR)libtest.so.0.0 libtest.so.0 libtest.so: $(libtest_OBJS) $(OBJDIR)libtest.so.0.0 $(OBJDIR)libtest.so.0 $(OBJDIR)libtest.so: $(libtest_OBJS)
$(CCSHARED) -o $(OBJDIR)libtest.so.0.0 -Wl,-soname,libtest.so.0 $(libtest_OBJS) $(libtest_LDFLAGS) $(CCSHARED) -o $(OBJDIR)libtest.so.0.0 -Wl,-soname,libtest.so.0 $(libtest_OBJS) $(libtest_LDFLAGS)
$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0 $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0
$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so