Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-22 20:34:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit to the trunk the fix for bug # 223987 - Fix LDAP library

Browse Source 
makefile to play nice with "make -jN" builds with MSVC.
This commit is contained in:
mcs%pearlcrescent.com 2004-05-24 14:25:07 +00:00
parent 49b7ed67db
commit b32baea218
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
directory/c-sdk/ldap/libraries/libldap/Makefile.in
View File

@ -278,7 +278,18 @@ versiont.c: Makefile.client Version.c
-e "s|%VERSION%|$${v}|" \
< Version.c > $@)
export:: $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(LIBLDAP) $(DLLLDAP)
# Set the default sources for the export target
EXPDEPS = $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(LIBLDAP) $(DLLLDAP)
# Remove the LIB source if on win32 and using MSVC
# This avoids problems with -jX builds where 'link' will make both the
# .dll and .lib files in one pass
ifeq ($(OS_ARCH), WINNT)
ifeq ($(LD),link)
EXPDEPS = $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(DLLLDAP)
endif
endif
export:: $(EXPDEPS)
ltest:: $(LIBLDAP) test.o
$(LINK_EXE) test.o
@ -315,7 +326,18 @@ veryclean:: clean
# the $(dist_bindir) line is for the mozilla client, which for reasons
# unknown wants shared libraries in /bin also
#
export:: $(LIBLDAP) $(DLLLDAP)
# Set the default sources for the export target
EXPDEPS2 = $(LIBLDAP) $(DLLLDAP)
# Remove the LIB source if on win32 and using MSVC
# This avoids problems with -jX builds where 'link' will make both the
# .dll and .lib files in one pass
ifeq ($(OS_ARCH), WINNT)
ifeq ($(LD),link)
EXPDEPS2 = $(DLLLDAP)
endif
endif
export:: $(EXPDEPS2)
ifdef MKSHLIB
$(INSTALL) -m 444 $(LIBLDAP) $(dist_libdir)
$(INSTALL) -m 444 $(DLLLDAP) $(dist_libdir)

13
directory/c-sdk/ldap/libraries/libprldap/Makefile.in
View File

@ -235,7 +235,18 @@ $(OBJDEST):
# the $(dist_bindir) line is for the mozilla client, which for reasons
# unknown wants shared libraries in /bin also
#
export:: $(LIBPRLDAP) $(DLLPRLDAP)
# Set the default sources for the export target
EXPDEPS2 = $(LIBPRLDAP) $(DLLPRLDAP)
# Remove the LIB source if on win32 and using MSVC
# This avoids problems with -jX builds where 'link' will make both the
# .dll and .lib files in one pass
ifeq ($(OS_ARCH), WINNT)
ifeq ($(LD),link)
EXPDEPS2 = $(DLLPRLDAP)
endif
endif
export:: $(EXPDEPS2)
ifeq ($(OS_ARCH), WINNT)
$(INSTALL) -m 555 $(LIBPRLDAP) $(dist_libdir)
$(INSTALL) -m 555 $(DLLPRLDAP) $(dist_libdir)