Pass all the tests again
This commit is contained in:
parent
22b4afcae6
commit
c87a3ffa84
@ -1173,7 +1173,7 @@ static int _target_library(Configure * configure, FILE * fp,
|
||||
if((p = config_get(configure->config, target, "depends")) != NULL)
|
||||
fprintf(fp, " %s", p);
|
||||
fputc('\n', fp);
|
||||
fprintf(fp, "%s%s%s", "\t$(CCSHARED) -o ", soname,
|
||||
fprintf(fp, "%s%s%s", "\t$(CCSHARED) -o $(OBJDIR)", soname,
|
||||
(configure->os != HO_MACOSX) ? ".0" : "");
|
||||
/* soname is not available on MacOS X */
|
||||
if(configure->os != HO_MACOSX)
|
||||
@ -1200,10 +1200,10 @@ static int _target_library(Configure * configure, FILE * fp,
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(fp, "%s%s%s%s%s", "\t$(LN) -s -- ", soname,
|
||||
".0 $(OBJDIR)", soname, "\n");
|
||||
fprintf(fp, "%s%s%s%s%s%s%s", "\t$(LN) -s -- ", soname,
|
||||
" $(OBJDIR)", target, ".0", soext, "\n");
|
||||
fprintf(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname,
|
||||
".0 $(OBJDIR)", target, soext, "\n");
|
||||
" $(OBJDIR)", target, soext, "\n");
|
||||
}
|
||||
string_delete(soname);
|
||||
return 0;
|
||||
@ -1975,8 +1975,8 @@ static int _install_target_library(Configure * configure, FILE * fp,
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(fp, "%s%s%s%s/%s%s", "\t$(INSTALL) -m 0755 ", soname,
|
||||
".0 $(DESTDIR)", path, soname, ".0\n");
|
||||
fprintf(fp, "%s%s%s%s/%s%s", "\t$(INSTALL) -m 0755 $(OBJDIR)",
|
||||
soname, ".0 $(DESTDIR)", path, soname, ".0\n");
|
||||
fprintf(fp, "%s%s%s%s/%s%s", "\t$(LN) -s -- ", soname,
|
||||
".0 $(DESTDIR)", path, soname, "\n");
|
||||
fprintf(fp, "%s%s%s%s/%s%s%s", "\t$(LN) -s -- ", soname,
|
||||
|
@ -1,4 +1,5 @@
|
||||
TARGETS = libtest.a libtest.0.0.dylib libtest.0.dylib libtest.dylib
|
||||
TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.0.0.dylib libtest.0.dylib libtest.dylib
|
||||
OBJDIR =
|
||||
PREFIX = /usr/local
|
||||
DESTDIR =
|
||||
LIBDIR = $(PREFIX)/lib
|
||||
@ -13,21 +14,21 @@ INSTALL = install
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
libtest_OBJS = test.o
|
||||
libtest_OBJS = $(OBJDIR)test.o
|
||||
libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||
libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
||||
|
||||
libtest.a: $(libtest_OBJS)
|
||||
$(AR) -rc libtest.a $(libtest_OBJS)
|
||||
$(RANLIB) libtest.a
|
||||
$(OBJDIR)libtest.a: $(libtest_OBJS)
|
||||
$(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
|
||||
$(RANLIB) $(OBJDIR)libtest.a
|
||||
|
||||
libtest.0.0.dylib libtest.0.dylib libtest.dylib: $(libtest_OBJS)
|
||||
$(CCSHARED) -o libtest.0.0.dylib -install_name $(LIBDIR)/libtest.0.dylib $(libtest_OBJS) $(libtest_LDFLAGS)
|
||||
$(LN) -s -- libtest.0.0.dylib libtest.0.dylib
|
||||
$(LN) -s -- libtest.0.0.dylib libtest.dylib
|
||||
$(OBJDIR)libtest.0.0.dylib libtest.0.dylib libtest.dylib: $(libtest_OBJS)
|
||||
$(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.dylib
|
||||
|
||||
test.o: test.c
|
||||
$(CC) $(libtest_CFLAGS) -c test.c
|
||||
$(OBJDIR)test.o: test.c
|
||||
$(CC) $(libtest_CFLAGS) -o $(OBJDIR)test.o -c test.c
|
||||
|
||||
clean:
|
||||
$(RM) -- $(libtest_OBJS)
|
||||
@ -37,8 +38,8 @@ distclean: clean
|
||||
|
||||
install: $(TARGETS)
|
||||
$(MKDIR) $(DESTDIR)$(LIBDIR)
|
||||
$(INSTALL) -m 0644 libtest.a $(DESTDIR)$(LIBDIR)/libtest.a
|
||||
$(INSTALL) -m 0755 libtest.0.0.dylib $(DESTDIR)$(LIBDIR)/libtest.0.0.dylib
|
||||
$(INSTALL) -m 0644 $(OBJDIR)libtest.a $(DESTDIR)$(LIBDIR)/libtest.a
|
||||
$(INSTALL) -m 0755 $(OBJDIR)libtest.0.0.dylib $(DESTDIR)$(LIBDIR)/libtest.0.0.dylib
|
||||
$(LN) -s -- libtest.0.0.dylib $(DESTDIR)$(LIBDIR)/libtest.0.dylib
|
||||
$(LN) -s -- libtest.0.0.dylib $(DESTDIR)$(LIBDIR)/libtest.dylib
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
TARGETS = libtest.a libtest.so.0.0 libtest.so.0 libtest.so
|
||||
TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.so.0.0 libtest.so.0 libtest.so
|
||||
OBJDIR =
|
||||
PREFIX = /usr/local
|
||||
DESTDIR =
|
||||
LIBDIR = $(PREFIX)/lib
|
||||
@ -13,21 +14,21 @@ INSTALL = install
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
libtest_OBJS = test.o
|
||||
libtest_OBJS = $(OBJDIR)test.o
|
||||
libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||
libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
||||
|
||||
libtest.a: $(libtest_OBJS)
|
||||
$(AR) -rc libtest.a $(libtest_OBJS)
|
||||
$(RANLIB) libtest.a
|
||||
$(OBJDIR)libtest.a: $(libtest_OBJS)
|
||||
$(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
|
||||
$(RANLIB) $(OBJDIR)libtest.a
|
||||
|
||||
libtest.so.0.0 libtest.so.0 libtest.so: $(libtest_OBJS)
|
||||
$(CCSHARED) -o libtest.so.0.0 -Wl,-soname,libtest.so.0 $(libtest_OBJS) $(libtest_LDFLAGS)
|
||||
$(LN) -s -- libtest.so.0.0 libtest.so.0
|
||||
$(LN) -s -- libtest.so.0.0 libtest.so
|
||||
$(OBJDIR)libtest.so.0.0 libtest.so.0 libtest.so: $(libtest_OBJS)
|
||||
$(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
|
||||
|
||||
test.o: test.c
|
||||
$(CC) $(libtest_CFLAGS) -c test.c
|
||||
$(OBJDIR)test.o: test.c
|
||||
$(CC) $(libtest_CFLAGS) -o $(OBJDIR)test.o -c test.c
|
||||
|
||||
clean:
|
||||
$(RM) -- $(libtest_OBJS)
|
||||
@ -37,8 +38,8 @@ distclean: clean
|
||||
|
||||
install: $(TARGETS)
|
||||
$(MKDIR) $(DESTDIR)$(LIBDIR)
|
||||
$(INSTALL) -m 0644 libtest.a $(DESTDIR)$(LIBDIR)/libtest.a
|
||||
$(INSTALL) -m 0755 libtest.so.0.0 $(DESTDIR)$(LIBDIR)/libtest.so.0.0
|
||||
$(INSTALL) -m 0644 $(OBJDIR)libtest.a $(DESTDIR)$(LIBDIR)/libtest.a
|
||||
$(INSTALL) -m 0755 $(OBJDIR)libtest.so.0.0 $(DESTDIR)$(LIBDIR)/libtest.so.0.0
|
||||
$(LN) -s -- libtest.so.0.0 $(DESTDIR)$(LIBDIR)/libtest.so.0
|
||||
$(LN) -s -- libtest.so.0.0 $(DESTDIR)$(LIBDIR)/libtest.so
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
TARGETS = test.dylib
|
||||
TARGETS = $(OBJDIR)test.dylib
|
||||
OBJDIR =
|
||||
PREFIX = /usr/local
|
||||
DESTDIR =
|
||||
LIBDIR = $(PREFIX)/lib
|
||||
@ -13,15 +14,15 @@ INSTALL = install
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
test_OBJS = test.o
|
||||
test_OBJS = $(OBJDIR)test.o
|
||||
test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||
test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
||||
|
||||
test.dylib: $(test_OBJS)
|
||||
$(CCSHARED) -o test.dylib $(test_OBJS) $(test_LDFLAGS)
|
||||
$(OBJDIR)test.dylib: $(test_OBJS)
|
||||
$(CCSHARED) -o $(OBJDIR)test.dylib $(test_OBJS) $(test_LDFLAGS)
|
||||
|
||||
test.o: test.c
|
||||
$(CC) $(test_CFLAGS) -c test.c
|
||||
$(OBJDIR)test.o: test.c
|
||||
$(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c
|
||||
|
||||
clean:
|
||||
$(RM) -- $(test_OBJS)
|
||||
@ -31,7 +32,7 @@ distclean: clean
|
||||
|
||||
install: $(TARGETS)
|
||||
$(MKDIR) $(DESTDIR)$(LIBDIR)/configure
|
||||
$(INSTALL) -m 0755 test.dylib $(DESTDIR)$(LIBDIR)/configure/test.dylib
|
||||
$(INSTALL) -m 0755 $(OBJDIR)test.dylib $(DESTDIR)$(LIBDIR)/configure/test.dylib
|
||||
|
||||
uninstall:
|
||||
$(RM) -- $(DESTDIR)$(LIBDIR)/configure/test.dylib
|
||||
|
@ -1,4 +1,5 @@
|
||||
TARGETS = test.so
|
||||
TARGETS = $(OBJDIR)test.so
|
||||
OBJDIR =
|
||||
PREFIX = /usr/local
|
||||
DESTDIR =
|
||||
LIBDIR = $(PREFIX)/lib
|
||||
@ -13,15 +14,15 @@ INSTALL = install
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
test_OBJS = test.o
|
||||
test_OBJS = $(OBJDIR)test.o
|
||||
test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||
test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
||||
|
||||
test.so: $(test_OBJS)
|
||||
$(CCSHARED) -o test.so $(test_OBJS) $(test_LDFLAGS)
|
||||
$(OBJDIR)test.so: $(test_OBJS)
|
||||
$(CCSHARED) -o $(OBJDIR)test.so $(test_OBJS) $(test_LDFLAGS)
|
||||
|
||||
test.o: test.c
|
||||
$(CC) $(test_CFLAGS) -c test.c
|
||||
$(OBJDIR)test.o: test.c
|
||||
$(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c
|
||||
|
||||
clean:
|
||||
$(RM) -- $(test_OBJS)
|
||||
@ -31,7 +32,7 @@ distclean: clean
|
||||
|
||||
install: $(TARGETS)
|
||||
$(MKDIR) $(DESTDIR)$(LIBDIR)/configure
|
||||
$(INSTALL) -m 0755 test.so $(DESTDIR)$(LIBDIR)/configure/test.so
|
||||
$(INSTALL) -m 0755 $(OBJDIR)test.so $(DESTDIR)$(LIBDIR)/configure/test.so
|
||||
|
||||
uninstall:
|
||||
$(RM) -- $(DESTDIR)$(LIBDIR)/configure/test.so
|
||||
|
Loading…
Reference in New Issue
Block a user