install shared libs in dist/ARCH/bin, not dist/ARCH/lib - following the same convention as the mozilla tree.

This commit is contained in:
toshok%hungry.com 1998-12-16 01:28:17 +00:00
Родитель 4d641fdae2
Коммит c8c9060102
3 изменённых файлов: 50 добавлений и 20 удалений

Просмотреть файл

@ -17,7 +17,7 @@
DEPTH = ../..
DIRS = lang io security
DIRS = lang io #security
include $(DEPTH)/config/config.mk

Просмотреть файл

@ -57,22 +57,56 @@ Flt64 doubleNegativeInfinity;
Flt32 floatNaN;
Flt64 doubleNaN;
struct DummyInit
{
DummyInit(Flt32 fZero, Flt64 dZero);
#ifdef IS_LITTLE_ENDIAN
#define DOUBLE_HI32(x) (((uint32 *)&(x))[1])
#define DOUBLE_LO32(x) (((uint32 *)&(x))[0])
#else
#define DOUBLE_HI32(x) (((uint32 *)&(x))[0])
#define DOUBLE_LO32(x) (((uint32 *)&(x))[1])
#endif
#define DOUBLE_HI32_SIGNBIT 0x80000000
#define DOUBLE_HI32_EXPMASK 0x7ff00000
#define DOUBLE_HI32_MANTMASK 0x000fffff
union dpun {
struct {
#ifdef IS_LITTLE_ENDIAN
uint32 lo, hi;
#else
uint32 hi, lo;
#endif
} s;
Flt64 d;
};
DummyInit dummyFloatInit(0.0f, 0.0);
DummyInit::DummyInit(Flt32 fZero, Flt64 dZero)
struct DummyInit
{
floatPositiveInfinity = 1.0f/fZero;
doublePositiveInfinity = 1.0/dZero;
floatNegativeInfinity = -1.0f/fZero;
doubleNegativeInfinity = -1.0/dZero;
floatNaN = fZero/fZero;
doubleNaN = dZero/dZero;
}
DummyInit() {
union dpun u;
#if notyet
floatPositiveInfinity = 1.0f/fZero;
floatNegativeInfinity = -1.0f/fZero;
floatNaN = fZero/fZero;
#endif
u.s.hi = DOUBLE_HI32_EXPMASK;
u.s.lo = 0x00000000;
doublePositiveInfinity = u.d;
u.s.hi = DOUBLE_HI32_SIGNBIT | DOUBLE_HI32_EXPMASK;
u.s.lo = 0x00000000;
doubleNegativeInfinity = u.d;
u.s.hi = DOUBLE_HI32_EXPMASK | DOUBLE_HI32_MANTMASK;
u.s.lo = 0xffffffff;
doubleNaN = u.d;
}
};
DummyInit dummyFloatInit;
#endif
// Wrapper around fmod() is necessary because some implementations doesn't

Просмотреть файл

@ -94,11 +94,7 @@ ifdef LIBRARY
$(INSTALL) -m 444 $(LIBRARY) $(DIST)/lib
endif
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),WINNT)
$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin
else
$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/lib
endif
endif
ifdef IMPORT_LIBRARY
$(INSTALL) -m 555 $(IMPORT_LIBRARY) $(DIST)/lib
@ -222,7 +218,7 @@ $(PROGRAM): $(OBJS)
ifeq ($(OS_ARCH),WINNT)
$(CC) $(OBJS) -Fe$@ -link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
else
$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(OS_LIBS)
$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(OS_LIBS)
endif
$(INSTALL) -m 555 $(PROGRAM) $(DIST)/bin
@ -272,7 +268,7 @@ else
endif
$(INSTALL) -m 555 $(LIBRARY) $(DIST)/lib
else
$(MKSHLIB) -o $@ $(OBJS) $(LD_LIBS) $(OS_LIBS) $(EXTRA_LIBS)
$(MKSHLIB) -o $@ $(OBJS) $(LD_LIBS) $(OS_LIBS) $(EXTRA_LIBS) -L$(DIST)/lib
chmod +x $@
endif
endif