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

Pass all the tests again

Browse Source
This commit is contained in:
Pierre Pronchery 2014-11-11 21:12:28 +01:00
parent 22b4afcae6
commit c87a3ffa84
5 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/makefile.c
View File

@ -1173,7 +1173,7 @@ static int _target_library(Configure * configure, FILE * fp,
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);
fprintf(fp, "%s%s%s", "\t$(CCSHARED) -o ", soname, fprintf(fp, "%s%s%s", "\t$(CCSHARED) -o $(OBJDIR)", soname,
(configure->os != HO_MACOSX) ? ".0" : ""); (configure->os != HO_MACOSX) ? ".0" : "");
/* soname is not available on MacOS X */ /* soname is not available on MacOS X */
if(configure->os != HO_MACOSX) if(configure->os != HO_MACOSX)
@ -1200,10 +1200,10 @@ static int _target_library(Configure * configure, FILE * fp,
} }
else else
{ {
fprintf(fp, "%s%s%s%s%s", "\t$(LN) -s -- ", soname, fprintf(fp, "%s%s%s%s%s%s%s", "\t$(LN) -s -- ", soname,
".0 $(OBJDIR)", soname, "\n"); " $(OBJDIR)", target, ".0", soext, "\n");
fprintf(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname, fprintf(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname,
".0 $(OBJDIR)", target, soext, "\n"); " $(OBJDIR)", target, soext, "\n");
} }
string_delete(soname); string_delete(soname);
return 0; return 0;
@ -1975,8 +1975,8 @@ static int _install_target_library(Configure * configure, FILE * fp,
} }
else else
{ {
fprintf(fp, "%s%s%s%s/%s%s", "\t$(INSTALL) -m 0755 ", soname, fprintf(fp, "%s%s%s%s/%s%s", "\t$(INSTALL) -m 0755 $(OBJDIR)",
".0 $(DESTDIR)", path, soname, ".0\n"); soname, ".0 $(DESTDIR)", path, soname, ".0\n");
fprintf(fp, "%s%s%s%s/%s%s", "\t$(LN) -s -- ", soname, fprintf(fp, "%s%s%s%s/%s%s", "\t$(LN) -s -- ", soname,
".0 $(DESTDIR)", path, soname, "\n"); ".0 $(DESTDIR)", path, soname, "\n");
fprintf(fp, "%s%s%s%s/%s%s%s", "\t$(LN) -s -- ", soname, fprintf(fp, "%s%s%s%s/%s%s%s", "\t$(LN) -s -- ", soname,

27
tests/library/Makefile.Darwin
View File

@ -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 PREFIX = /usr/local
DESTDIR = DESTDIR =
LIBDIR = $(PREFIX)/lib LIBDIR = $(PREFIX)/lib
@ -13,21 +14,21 @@ INSTALL = install
all: $(TARGETS) all: $(TARGETS)
libtest_OBJS = test.o libtest_OBJS = $(OBJDIR)test.o
libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
libtest.a: $(libtest_OBJS) $(OBJDIR)libtest.a: $(libtest_OBJS)
$(AR) -rc libtest.a $(libtest_OBJS) $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
$(RANLIB) libtest.a $(RANLIB) $(OBJDIR)libtest.a
libtest.0.0.dylib libtest.0.dylib libtest.dylib: $(libtest_OBJS) $(OBJDIR)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) $(CCSHARED) -o $(OBJDIR)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 $(OBJDIR)libtest.0.dylib
$(LN) -s -- libtest.0.0.dylib libtest.dylib $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.dylib
test.o: test.c $(OBJDIR)test.o: test.c
$(CC) $(libtest_CFLAGS) -c test.c $(CC) $(libtest_CFLAGS) -o $(OBJDIR)test.o -c test.c
clean: clean:
$(RM) -- $(libtest_OBJS) $(RM) -- $(libtest_OBJS)
@ -37,8 +38,8 @@ distclean: clean
install: $(TARGETS) install: $(TARGETS)
$(MKDIR) $(DESTDIR)$(LIBDIR) $(MKDIR) $(DESTDIR)$(LIBDIR)
$(INSTALL) -m 0644 libtest.a $(DESTDIR)$(LIBDIR)/libtest.a $(INSTALL) -m 0644 $(OBJDIR)libtest.a $(DESTDIR)$(LIBDIR)/libtest.a
$(INSTALL) -m 0755 libtest.0.0.dylib $(DESTDIR)$(LIBDIR)/libtest.0.0.dylib $(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.0.dylib
$(LN) -s -- libtest.0.0.dylib $(DESTDIR)$(LIBDIR)/libtest.dylib $(LN) -s -- libtest.0.0.dylib $(DESTDIR)$(LIBDIR)/libtest.dylib

27
tests/library/Makefile.NetBSD
View File

@ -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 PREFIX = /usr/local
DESTDIR = DESTDIR =
LIBDIR = $(PREFIX)/lib LIBDIR = $(PREFIX)/lib
@ -13,21 +14,21 @@ INSTALL = install
all: $(TARGETS) all: $(TARGETS)
libtest_OBJS = test.o libtest_OBJS = $(OBJDIR)test.o
libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) libtest_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) libtest_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
libtest.a: $(libtest_OBJS) $(OBJDIR)libtest.a: $(libtest_OBJS)
$(AR) -rc libtest.a $(libtest_OBJS) $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
$(RANLIB) libtest.a $(RANLIB) $(OBJDIR)libtest.a
libtest.so.0.0 libtest.so.0 libtest.so: $(libtest_OBJS) $(OBJDIR)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) $(CCSHARED) -o $(OBJDIR)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 $(OBJDIR)libtest.so.0
$(LN) -s -- libtest.so.0.0 libtest.so $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so
test.o: test.c $(OBJDIR)test.o: test.c
$(CC) $(libtest_CFLAGS) -c test.c $(CC) $(libtest_CFLAGS) -o $(OBJDIR)test.o -c test.c
clean: clean:
$(RM) -- $(libtest_OBJS) $(RM) -- $(libtest_OBJS)
@ -37,8 +38,8 @@ distclean: clean
install: $(TARGETS) install: $(TARGETS)
$(MKDIR) $(DESTDIR)$(LIBDIR) $(MKDIR) $(DESTDIR)$(LIBDIR)
$(INSTALL) -m 0644 libtest.a $(DESTDIR)$(LIBDIR)/libtest.a $(INSTALL) -m 0644 $(OBJDIR)libtest.a $(DESTDIR)$(LIBDIR)/libtest.a
$(INSTALL) -m 0755 libtest.so.0.0 $(DESTDIR)$(LIBDIR)/libtest.so.0.0 $(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.0
$(LN) -s -- libtest.so.0.0 $(DESTDIR)$(LIBDIR)/libtest.so $(LN) -s -- libtest.so.0.0 $(DESTDIR)$(LIBDIR)/libtest.so

15
tests/plugin/Makefile.Darwin
View File

@ -1,4 +1,5 @@
TARGETS = test.dylib TARGETS = $(OBJDIR)test.dylib
OBJDIR =
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
LIBDIR = $(PREFIX)/lib LIBDIR = $(PREFIX)/lib
@ -13,15 +14,15 @@ INSTALL = install
all: $(TARGETS) all: $(TARGETS)
test_OBJS = test.o test_OBJS = $(OBJDIR)test.o
test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
test.dylib: $(test_OBJS) $(OBJDIR)test.dylib: $(test_OBJS)
$(CCSHARED) -o test.dylib $(test_OBJS) $(test_LDFLAGS) $(CCSHARED) -o $(OBJDIR)test.dylib $(test_OBJS) $(test_LDFLAGS)
test.o: test.c $(OBJDIR)test.o: test.c
$(CC) $(test_CFLAGS) -c test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c
clean: clean:
$(RM) -- $(test_OBJS) $(RM) -- $(test_OBJS)
@ -31,7 +32,7 @@ distclean: clean
install: $(TARGETS) install: $(TARGETS)
$(MKDIR) $(DESTDIR)$(LIBDIR)/configure $(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: uninstall:
$(RM) -- $(DESTDIR)$(LIBDIR)/configure/test.dylib $(RM) -- $(DESTDIR)$(LIBDIR)/configure/test.dylib

15
tests/plugin/Makefile.NetBSD
View File

@ -1,4 +1,5 @@
TARGETS = test.so TARGETS = $(OBJDIR)test.so
OBJDIR =
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
LIBDIR = $(PREFIX)/lib LIBDIR = $(PREFIX)/lib
@ -13,15 +14,15 @@ INSTALL = install
all: $(TARGETS) all: $(TARGETS)
test_OBJS = test.o test_OBJS = $(OBJDIR)test.o
test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
test.so: $(test_OBJS) $(OBJDIR)test.so: $(test_OBJS)
$(CCSHARED) -o test.so $(test_OBJS) $(test_LDFLAGS) $(CCSHARED) -o $(OBJDIR)test.so $(test_OBJS) $(test_LDFLAGS)
test.o: test.c $(OBJDIR)test.o: test.c
$(CC) $(test_CFLAGS) -c test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c
clean: clean:
$(RM) -- $(test_OBJS) $(RM) -- $(test_OBJS)
@ -31,7 +32,7 @@ distclean: clean
install: $(TARGETS) install: $(TARGETS)
$(MKDIR) $(DESTDIR)$(LIBDIR)/configure $(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: uninstall:
$(RM) -- $(DESTDIR)$(LIBDIR)/configure/test.so $(RM) -- $(DESTDIR)$(LIBDIR)/configure/test.so