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

Do not link to libraries before being built

Browse Source
This commit is contained in:
Pierre Pronchery 2015-05-21 01:52:44 +02:00
parent 08a54f65c4
commit bbff942d35
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/makefile.c
View File

@ -1260,22 +1260,23 @@ static int _target_library(Configure * configure, FILE * fp,
_makefile_print(fp, "%c", '\n'); _makefile_print(fp, "%c", '\n');
if(configure->os == HO_MACOSX) if(configure->os == HO_MACOSX)
{ {
_makefile_print(fp, "%s%s%s%s%s", "\n$(OBJDIR)", target, ".0", _makefile_print(fp, "%s%s%s%s%s%s%s", "\n$(OBJDIR)", target,
soext, ":\n"); ".0", soext, ": $(OBJDIR)", soname, "\n");
_makefile_print(fp, "%s%s%s%s%s%s%s", "\t$(LN) -s -- ", soname, _makefile_print(fp, "%s%s%s%s%s%s%s", "\t$(LN) -s -- ", soname,
" $(OBJDIR)", target, ".0", soext, "\n"); " $(OBJDIR)", target, ".0", soext, "\n");
_makefile_print(fp, "%s%s%s%s", "\n$(OBJDIR)", target, soext, _makefile_print(fp, "%s%s%s%s%s%s", "\n$(OBJDIR)", target,
":\n"); soext, ": $(OBJDIR)", soname, "\n");
_makefile_print(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname, _makefile_print(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname,
" $(OBJDIR)", target, soext, "\n"); " $(OBJDIR)", target, soext, "\n");
} }
else if(configure->os != HO_WIN32) else if(configure->os != HO_WIN32)
{ {
_makefile_print(fp, "%s%s%s", "\n$(OBJDIR)", soname, ":\n"); _makefile_print(fp, "%s%s%s%s%s", "\n$(OBJDIR)", soname,
": $(OBJDIR)", soname, ".0\n");
_makefile_print(fp, "%s%s%s%s%s", "\t$(LN) -s -- ", soname, _makefile_print(fp, "%s%s%s%s%s", "\t$(LN) -s -- ", soname,
".0 $(OBJDIR)", soname, "\n"); ".0 $(OBJDIR)", soname, "\n");
_makefile_print(fp, "%s%s%s%s", "\n$(OBJDIR)", target, soext, _makefile_print(fp, "%s%s%s%s%s%s", "\n$(OBJDIR)", target,
":\n"); soext, ": $(OBJDIR)", soname, ".0\n");
_makefile_print(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname, _makefile_print(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname,
".0 $(OBJDIR)", target, soext, "\n"); ".0 $(OBJDIR)", target, soext, "\n");
} }

4
tests/library/Makefile.Darwin
View File

@ -26,10 +26,10 @@ $(OBJDIR)libtest.a: $(libtest_OBJS)
$(OBJDIR)libtest.0.0.dylib: $(libtest_OBJS) $(OBJDIR)libtest.0.0.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)
$(OBJDIR)libtest.0.dylib: $(OBJDIR)libtest.0.dylib: $(OBJDIR)libtest.0.0.dylib
$(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.0.dylib $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.0.dylib
$(OBJDIR)libtest.dylib: $(OBJDIR)libtest.dylib: $(OBJDIR)libtest.0.0.dylib
$(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.dylib $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.dylib
$(OBJDIR)test.o: test.c $(OBJDIR)test.o: test.c

4
tests/library/Makefile.Linux
View File

@ -26,10 +26,10 @@ $(OBJDIR)libtest.a: $(libtest_OBJS)
$(OBJDIR)libtest.so.0.0: $(libtest_OBJS) $(OBJDIR)libtest.so.0.0: $(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)
$(OBJDIR)libtest.so.0: $(OBJDIR)libtest.so.0: $(OBJDIR)libtest.so.0.0
$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0 $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0
$(OBJDIR)libtest.so: $(OBJDIR)libtest.so: $(OBJDIR)libtest.so.0.0
$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so
$(OBJDIR)test.o: test.c $(OBJDIR)test.o: test.c

4
tests/library/Makefile.NetBSD
View File

@ -26,10 +26,10 @@ $(OBJDIR)libtest.a: $(libtest_OBJS)
$(OBJDIR)libtest.so.0.0: $(libtest_OBJS) $(OBJDIR)libtest.so.0.0: $(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)
$(OBJDIR)libtest.so.0: $(OBJDIR)libtest.so.0: $(OBJDIR)libtest.so.0.0
$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0 $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0
$(OBJDIR)libtest.so: $(OBJDIR)libtest.so: $(OBJDIR)libtest.so.0.0
$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so
$(OBJDIR)test.o: test.c $(OBJDIR)test.o: test.c