Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add SRCS_IN_OBJDIR variable to workaround requirement introduced by bug 141834 that srcfiles must be in the srcdir.

Browse Source 
Bug #171753 r=bryner


git-svn-id: svn://10.0.0.236/trunk@135219 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com
2002-12-13 02:36:06 +00:00
parent e168773802
commit afb973633f
11 changed files with 49 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/config/rules.mk
View File

@@ -95,11 +95,23 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
_EXTRA_DSO_RELATIVE_PATHS=1
else
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
ifndef SRCS_IN_OBJDIR
_NO_AUTO_VARS=1
endif
_EXTRA_DSO_RELATIVE_PATHS=1
endif
endif
ifdef SRCS_IN_OBJDIR
ifeq ($(OS_ARCH),WINNT)
_VPATH_SRCS = $(shell cygpath -m $< | grep ^.:/ || cygpath -m `pwd`/$<)
else
_VPATH_SRCS = $<
endif
else
_VPATH_SRCS = $<
endif
ifdef _EXTRA_DSO_RELATIVE_PATHS
EXTRA_DSO_LIBS := $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/$(LIB_PREFIX),$(EXTRA_DSO_LIBS)))
EXTRA_DSO_LIBS := $(filter-out %/bin %/lib,$(EXTRA_DSO_LIBS))
@@ -994,7 +1006,7 @@ host_%.o: %.c Makefile.in
ifdef _NO_AUTO_VARS
$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(srcdir)/$*.c
else
$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $<
$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
endif
%: %.c Makefile.in
@@ -1003,7 +1015,7 @@ endif
ifdef _NO_AUTO_VARS
$(ELOG) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTOPTION)$@ $(srcdir)/$*.c
else
$(ELOG) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTOPTION)$@ $<
$(ELOG) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTOPTION)$@ $(_VPATH_SRCS)
endif
%.$(OBJ_SUFFIX): %.c Makefile.in
@@ -1012,7 +1024,7 @@ endif
ifdef _NO_AUTO_VARS
$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $(srcdir)/$*.c
else
$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $<
$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $(_VPATH_SRCS)
endif
moc_%.cpp: %.h Makefile.in
@@ -1024,7 +1036,7 @@ moc_%.cpp: %.h Makefile.in
ifeq ($(MOZ_OS2_TOOLS),VACPP)
$(AS) -Fdo:./$(OBJDIR) -Feo:.$(OBJ_SUFFIX) $(ASFLAGS) $(AS_DASH_C_FLAG) $<
else
$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $<
$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
endif
%.$(OBJ_SUFFIX): %.S Makefile.in
@@ -1035,7 +1047,7 @@ endif
ifdef _NO_AUTO_VARS
$(CCC) $(OUTOPTION)$@ $(CXXFLAGS) $(srcdir)/$*.cpp $(LDFLAGS)
else
$(CCC) $(OUTOPTION)$@ $(CXXFLAGS) $< $(LDFLAGS)
$(CCC) $(OUTOPTION)$@ $(CXXFLAGS) $(_VPATH_SRCS) $(LDFLAGS)
endif
#
@@ -1047,7 +1059,7 @@ endif
ifdef _NO_AUTO_VARS
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(srcdir)/$*.cc
else
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $<
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
endif
%.$(OBJ_SUFFIX): %.cpp Makefile.in
@@ -1061,7 +1073,7 @@ else
ifdef _NO_AUTO_VARS
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(srcdir)/$*.cpp
else
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $<
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
endif
endif #STRICT_CPLUSPLUS_SUFFIX
@@ -1225,7 +1237,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
ifdef _NO_AUTO_VARS
$(ELOG) $(XPIDL_COMPILE) -m header -w -I $(IDL_DIR) -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $(srcdir)/$*.idl
else
$(ELOG) $(XPIDL_COMPILE) -m header -w -I $(IDL_DIR) -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
$(ELOG) $(XPIDL_COMPILE) -m header -w -I $(IDL_DIR) -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS)
endif
@if test -n "$(findstring $*.h, $(EXPORTS) $(SDK_HEADERS))"; \
then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
@@ -1238,7 +1250,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_COMPILE)
ifdef _NO_AUTO_VARS
$(ELOG) $(XPIDL_COMPILE) -m typelib -w -I $(IDL_DIR) -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $(srcdir)/$*.idl
else
$(ELOG) $(XPIDL_COMPILE) -m typelib -w -I $(IDL_DIR) -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $<
$(ELOG) $(XPIDL_COMPILE) -m typelib -w -I $(IDL_DIR) -I$(srcdir) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS)
endif
$(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.xpt,$(XPIDLSRCS) $(SDK_XPIDLSRCS)) Makefile.in Makefile

4
mozilla/embedding/browser/activex/src/plugin/Makefile.in
View File

@@ -181,12 +181,14 @@ LIBS = \
$(NULL)
endif
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
CXXFLAGS += -GX
copy-sources: $(addprefix $(MOZCTLSRC)/,$(_CONTROL_CPPSRCS))
$(INSTALL) $^ $(srcdir)
$(INSTALL) $^ .
export:: copy-sources

15
mozilla/mailnews/extensions/palmsync/build/Makefile.in
View File

@@ -51,7 +51,7 @@ LOCAL_INCLUDES = -I.
# Force use of PIC
FORCE_USE_PIC = 1
FORCE_SHARED_LIB = 1
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
@@ -60,18 +60,9 @@ $(MIDL_GENERATED_FILES): done_gen
done_gen: IPalmSync.idl
$(RM) $(SRCDIR_CSRCS)
$(MIDL) $(UNICODE_FLAGS) $(srcdir)/IPalmSync.idl
"$(MIDL)" $(UNICODE_FLAGS) $(srcdir)/IPalmSync.idl
touch $@
copy_csrcs: done_gen
@for f in $(CSRCS); do \
if test ! -f $(srcdir)/$$f; then \
cp $$f $(srcdir)/$$f; \
fi ; \
done
$(SRCDIR_CSRCS): copy_csrcs
export:: done_gen copy_csrcs
export:: done_gen

12
mozilla/mailnews/mapi/mapihook/build/Makefile.in
View File

@@ -51,6 +51,7 @@ LOCAL_INCLUDES = -I.
# Force use of PIC
FORCE_USE_PIC = 1
FORCE_SHARED_LIB = 1
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
@@ -63,15 +64,6 @@ done_gen: msgMapi.idl
"$(MIDL)" $(UNICODE_FLAGS) $(srcdir)/msgMapi.idl
touch $@
copy_csrcs: done_gen
@for f in $(CSRCS); do \
if test ! -f $(srcdir)/$$f; then \
cp $$f $(srcdir)/$$f; \
fi ; \
done
$(SRCDIR_CSRCS): copy_csrcs
export:: done_gen copy_csrcs
export:: done_gen

6
mozilla/modules/libjar/standalone/Makefile.in
View File

@@ -58,6 +58,8 @@ ifeq ($(OS_ARCH),OS2)
USE_STATIC_LIBS=1
endif
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH), Linux)
@@ -69,8 +71,4 @@ DEFINES += -DSTANDALONE
LOCAL_INCLUDES = -I$(srcdir)/..
export:: $(MODULES_LIBJAR_CPPSRCS)
ifeq ($(OS_ARCH),WINNT)
$(INSTALL) $^ $(srcdir)
else
$(INSTALL) $^ .
endif

5
mozilla/modules/zlib/standalone/Makefile.in
View File

@@ -35,6 +35,7 @@ CSRCS = $(MODULES_ZLIB_SRC_LCSRCS)
EXPORTS = $(MODULES_ZLIB_SRC_EXPORTS)
FORCE_STATIC_LIB = 1
SRCS_IN_OBJDIR = 1
ifeq ($(OS_ARCH),WINNT)
USE_NON_MT_LIBS=1
@@ -57,9 +58,5 @@ include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = -I$(srcdir)/../src
export:: $(MODULES_ZLIB_SRC_CSRCS)
ifeq ($(OS_ARCH),WINNT)
$(INSTALL) $^ $(srcdir)
else
$(INSTALL) $^ .
endif

9
mozilla/uriloader/exthandler/Makefile.in
View File

@@ -73,7 +73,7 @@ OSHELPER = nsOSHelperAppService.cpp
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
OSHELPER += nsInternetConfig.cpp \
nsInternetConfigService.cpp \
nsInternetConfigService.cpp) \
$(NULL)
endif
@@ -101,15 +101,16 @@ CPPSRCS = \
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += shell32.lib
GARBAGE += nsOSHelperAppService.cpp
GARBAGE += nsOSHelperAppService.cpp $(srcdir)/nsOSHelperAppService.cpp
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
# the use of multiple VPATH dirs is broken in cygwin make
ifeq ($(OS_ARCH),WINNT)
export:: $(OSDIR)/nsOSHelperAppService.cpp
$(INSTALL) $^ $(srcdir)
$(INSTALL) $^ .
endif

4
mozilla/widget/src/windows/Makefile.in
View File

@@ -88,10 +88,12 @@ FORCE_STATIC_LIB = 1
GARBAGE += L_Ienumfe.cpp $(srcdir)/L_Ienumfe.cpp
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
# Silly case-insensitive fs
export:: IENUMFE.CPP
cp $< $(srcdir)/L_Ienumfe.cpp
cp $< L_Ienumfe.cpp

13
mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in
View File

@@ -63,6 +63,8 @@ FORCE_SHARED_LIB = 1
LOCAL_INCLUDES = -I.
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
$(MIDL_GENERATED_FILES): done_gen
@@ -74,16 +76,7 @@ done_gen: ISimpleDOMDocument.idl
cp ISimpleDOMDocument_i.c ../../ISimpleDOMDocument_iid.h
touch $@
copy_csrcs: done_gen
@for f in $(CSRCS); do \
if test ! -f $(srcdir)/$$f; then \
cp $$f $(srcdir)/$$f; \
fi ; \
done
$(SRCDIR_CSRCS): copy_csrcs
export:: done_gen copy_csrcs
export:: done_gen
libs::
regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)

13
mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in
View File

@@ -63,6 +63,8 @@ FORCE_SHARED_LIB = 1
LOCAL_INCLUDES = -I.
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
$(MIDL_GENERATED_FILES): done_gen
@@ -74,16 +76,7 @@ done_gen: ISimpleDOMNode.idl
cp ISimpleDOMNode_i.c ../../ISimpleDOMNode_iid.h
touch $@
copy_csrcs: done_gen
@for f in $(CSRCS); do \
if test ! -f $(srcdir)/$$f; then \
cp $$f $(srcdir)/$$f; \
fi ; \
done
$(SRCDIR_CSRCS): copy_csrcs
export:: done_gen copy_csrcs
export:: done_gen
libs::
regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)

15
mozilla/xpcom/glue/standalone/Makefile.in
View File

@@ -93,21 +93,12 @@ GARBAGE += $(addprefix $(srcdir)/,$(XPCOM_GLUE_SRC_LCSRCS))
GARBAGE += $(addprefix $(srcdir)/,$(STRING_LCSRCS))
endif
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
export:: $(XPCOM_GLUE_SRC_CSRCS)
ifeq ($(OS_ARCH),WINNT)
$(INSTALL) $^ $(srcdir)
else
export:: $(XPCOM_GLUE_SRC_CSRCS) $(STRING_CSRCS)
$(INSTALL) $^ .
endif
export:: $(STRING_CSRCS)
ifeq ($(OS_ARCH),WINNT)
$(INSTALL) $^ $(srcdir)
else
$(INSTALL) $^ .
endif
DEFINES += -DXPCOM_GLUE