mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 748001 - Use explicit targets for object files. r=ted
This commit is contained in:
Mike Hommey
parent
adc74e86ad
commit
c20538e54d
@ -361,25 +361,25 @@ ifndef TARGETS
|
||||
TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
|
||||
endif
|
||||
|
||||
COBJS = $(CSRCS:.c=.$(OBJ_SUFFIX))
|
||||
SOBJS = $(SSRCS:.S=.$(OBJ_SUFFIX))
|
||||
CCOBJS = $(patsubst %.cc,%.$(OBJ_SUFFIX),$(filter %.cc,$(CPPSRCS)))
|
||||
CPPOBJS = $(patsubst %.cpp,%.$(OBJ_SUFFIX),$(filter %.cpp,$(CPPSRCS)))
|
||||
CMOBJS = $(CMSRCS:.m=.$(OBJ_SUFFIX))
|
||||
CMMOBJS = $(CMMSRCS:.mm=.$(OBJ_SUFFIX))
|
||||
ASOBJS = $(ASFILES:.$(ASM_SUFFIX)=.$(OBJ_SUFFIX))
|
||||
ifndef OBJS
|
||||
_OBJS = \
|
||||
$(JRI_STUB_CFILES) \
|
||||
$(addsuffix .$(OBJ_SUFFIX), $(JMC_GEN)) \
|
||||
$(CSRCS:.c=.$(OBJ_SUFFIX)) \
|
||||
$(SSRCS:.S=.$(OBJ_SUFFIX)) \
|
||||
$(patsubst %.cc,%.$(OBJ_SUFFIX),$(CPPSRCS:.cpp=.$(OBJ_SUFFIX))) \
|
||||
$(CMSRCS:.m=.$(OBJ_SUFFIX)) \
|
||||
$(CMMSRCS:.mm=.$(OBJ_SUFFIX)) \
|
||||
$(ASFILES:.$(ASM_SUFFIX)=.$(OBJ_SUFFIX))
|
||||
OBJS = $(strip $(_OBJS))
|
||||
_OBJS = $(COBJS) $(SOBJS) $(CCOBJS) $(CPPOBJS) $(CMOBJS) $(CMMOBJS) $(ASOBJS)
|
||||
OBJS = $(strip $(_OBJS))
|
||||
endif
|
||||
|
||||
HOST_COBJS = $(addprefix host_,$(HOST_CSRCS:.c=.$(OBJ_SUFFIX)))
|
||||
HOST_CCOBJS = $(addprefix host_,$(patsubst %.cc,%.$(OBJ_SUFFIX),$(filter %.cc,$(HOST_CPPSRCS))))
|
||||
HOST_CPPOBJS = $(addprefix host_,$(patsubst %.cpp,%.$(OBJ_SUFFIX),$(filter %.cpp,$(HOST_CPPSRCS))))
|
||||
HOST_CMOBJS = $(addprefix host_,$(HOST_CMSRCS:.m=.$(OBJ_SUFFIX)))
|
||||
HOST_CMMOBJS = $(addprefix host_,$(HOST_CMMSRCS:.mm=.$(OBJ_SUFFIX)))
|
||||
ifndef HOST_OBJS
|
||||
_HOST_OBJS = \
|
||||
$(addprefix host_,$(HOST_CSRCS:.c=.$(OBJ_SUFFIX))) \
|
||||
$(addprefix host_,$(patsubst %.cc,%.$(OBJ_SUFFIX),$(HOST_CPPSRCS:.cpp=.$(OBJ_SUFFIX)))) \
|
||||
$(addprefix host_,$(HOST_CMSRCS:.m=.$(OBJ_SUFFIX))) \
|
||||
$(addprefix host_,$(HOST_CMMSRCS:.mm=.$(OBJ_SUFFIX)))
|
||||
_HOST_OBJS = $(HOST_COBJS) $(HOST_CCOBJS) $(HOST_CPPOBJS) $(HOST_CMOBJS) $(HOST_CMMOBJS)
|
||||
HOST_OBJS = $(strip $(_HOST_OBJS))
|
||||
endif
|
||||
|
||||
@ -1090,32 +1090,27 @@ endif # MOZ_AUTO_DEPS
|
||||
$(OBJS) $(HOST_OBJS): $(GLOBAL_DEPS)
|
||||
|
||||
# Rules for building native targets must come first because of the host_ prefix
|
||||
host_%.$(OBJ_SUFFIX): %.c
|
||||
$(HOST_COBJS): host_%.$(OBJ_SUFFIX): %.c
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
host_%.$(OBJ_SUFFIX): %.cpp
|
||||
$(HOST_CPPOBJS): host_%.$(OBJ_SUFFIX): %.cpp
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
host_%.$(OBJ_SUFFIX): %.cc
|
||||
$(HOST_CCOBJS): host_%.$(OBJ_SUFFIX): %.cc
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
host_%.$(OBJ_SUFFIX): %.m
|
||||
$(HOST_CMOBJS): host_%.$(OBJ_SUFFIX): %.m
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
host_%.$(OBJ_SUFFIX): %.mm
|
||||
$(HOST_CMMOBJS): host_%.$(OBJ_SUFFIX): %.mm
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
%:: %.c $(GLOBAL_DEPS)
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CC)
|
||||
$(ELOG) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTOPTION)$@ $(_VPATH_SRCS)
|
||||
|
||||
%.$(OBJ_SUFFIX): %.c
|
||||
$(COBJS): %.$(OBJ_SUFFIX): %.c
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CC)
|
||||
$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $(_VPATH_SRCS)
|
||||
@ -1135,26 +1130,22 @@ qrc_%.cpp: %.qrc
|
||||
ifdef ASFILES
|
||||
# The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
|
||||
# a '-c' flag.
|
||||
%.$(OBJ_SUFFIX): %.$(ASM_SUFFIX)
|
||||
$(ASOBJS): %.$(OBJ_SUFFIX): %.$(ASM_SUFFIX)
|
||||
$(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
|
||||
endif
|
||||
|
||||
%.$(OBJ_SUFFIX): %.S
|
||||
$(SOBJS): %.$(OBJ_SUFFIX): %.S
|
||||
$(AS) -o $@ $(ASFLAGS) -c $<
|
||||
|
||||
%:: %.cpp $(GLOBAL_DEPS)
|
||||
@$(MAKE_DEPS_AUTO_CXX)
|
||||
$(CCC) $(OUTOPTION)$@ $(CXXFLAGS) $(_VPATH_SRCS) $(LDFLAGS)
|
||||
|
||||
#
|
||||
# Please keep the next two rules in sync.
|
||||
#
|
||||
%.$(OBJ_SUFFIX): %.cc
|
||||
$(CCOBJS): %.$(OBJ_SUFFIX): %.cc
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CXX)
|
||||
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
%.$(OBJ_SUFFIX): %.cpp
|
||||
$(CPPOBJS): %.$(OBJ_SUFFIX): %.cpp
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CXX)
|
||||
ifdef STRICT_CPLUSPLUS_SUFFIX
|
||||
@ -1165,12 +1156,12 @@ else
|
||||
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
|
||||
endif #STRICT_CPLUSPLUS_SUFFIX
|
||||
|
||||
$(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm
|
||||
$(CMMOBJS): $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CXX)
|
||||
$(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
$(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m
|
||||
$(CMOBJS): $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CC)
|
||||
$(ELOG) $(CC) -o $@ -c $(COMPILE_CFLAGS) $(COMPILE_CMFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
@ -480,9 +480,11 @@ endif
|
||||
|
||||
# Define keyword generator before rules.mk, see bug 323979 comment 50
|
||||
|
||||
HOST_CPPSRCS += jskwgen.cpp
|
||||
HOST_SIMPLE_PROGRAMS += host_jskwgen$(HOST_BIN_SUFFIX)
|
||||
GARBAGE += jsautokw.h host_jskwgen$(HOST_BIN_SUFFIX)
|
||||
|
||||
HOST_CPPSRCS += jsoplengen.cpp
|
||||
HOST_SIMPLE_PROGRAMS += host_jsoplengen$(HOST_BIN_SUFFIX)
|
||||
GARBAGE += jsautooplen.h host_jsoplengen$(HOST_BIN_SUFFIX)
|
||||
|
||||
|
||||
@ -361,25 +361,25 @@ ifndef TARGETS
|
||||
TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
|
||||
endif
|
||||
|
||||
COBJS = $(CSRCS:.c=.$(OBJ_SUFFIX))
|
||||
SOBJS = $(SSRCS:.S=.$(OBJ_SUFFIX))
|
||||
CCOBJS = $(patsubst %.cc,%.$(OBJ_SUFFIX),$(filter %.cc,$(CPPSRCS)))
|
||||
CPPOBJS = $(patsubst %.cpp,%.$(OBJ_SUFFIX),$(filter %.cpp,$(CPPSRCS)))
|
||||
CMOBJS = $(CMSRCS:.m=.$(OBJ_SUFFIX))
|
||||
CMMOBJS = $(CMMSRCS:.mm=.$(OBJ_SUFFIX))
|
||||
ASOBJS = $(ASFILES:.$(ASM_SUFFIX)=.$(OBJ_SUFFIX))
|
||||
ifndef OBJS
|
||||
_OBJS = \
|
||||
$(JRI_STUB_CFILES) \
|
||||
$(addsuffix .$(OBJ_SUFFIX), $(JMC_GEN)) \
|
||||
$(CSRCS:.c=.$(OBJ_SUFFIX)) \
|
||||
$(SSRCS:.S=.$(OBJ_SUFFIX)) \
|
||||
$(patsubst %.cc,%.$(OBJ_SUFFIX),$(CPPSRCS:.cpp=.$(OBJ_SUFFIX))) \
|
||||
$(CMSRCS:.m=.$(OBJ_SUFFIX)) \
|
||||
$(CMMSRCS:.mm=.$(OBJ_SUFFIX)) \
|
||||
$(ASFILES:.$(ASM_SUFFIX)=.$(OBJ_SUFFIX))
|
||||
OBJS = $(strip $(_OBJS))
|
||||
_OBJS = $(COBJS) $(SOBJS) $(CCOBJS) $(CPPOBJS) $(CMOBJS) $(CMMOBJS) $(ASOBJS)
|
||||
OBJS = $(strip $(_OBJS))
|
||||
endif
|
||||
|
||||
HOST_COBJS = $(addprefix host_,$(HOST_CSRCS:.c=.$(OBJ_SUFFIX)))
|
||||
HOST_CCOBJS = $(addprefix host_,$(patsubst %.cc,%.$(OBJ_SUFFIX),$(filter %.cc,$(HOST_CPPSRCS))))
|
||||
HOST_CPPOBJS = $(addprefix host_,$(patsubst %.cpp,%.$(OBJ_SUFFIX),$(filter %.cpp,$(HOST_CPPSRCS))))
|
||||
HOST_CMOBJS = $(addprefix host_,$(HOST_CMSRCS:.m=.$(OBJ_SUFFIX)))
|
||||
HOST_CMMOBJS = $(addprefix host_,$(HOST_CMMSRCS:.mm=.$(OBJ_SUFFIX)))
|
||||
ifndef HOST_OBJS
|
||||
_HOST_OBJS = \
|
||||
$(addprefix host_,$(HOST_CSRCS:.c=.$(OBJ_SUFFIX))) \
|
||||
$(addprefix host_,$(patsubst %.cc,%.$(OBJ_SUFFIX),$(HOST_CPPSRCS:.cpp=.$(OBJ_SUFFIX)))) \
|
||||
$(addprefix host_,$(HOST_CMSRCS:.m=.$(OBJ_SUFFIX))) \
|
||||
$(addprefix host_,$(HOST_CMMSRCS:.mm=.$(OBJ_SUFFIX)))
|
||||
_HOST_OBJS = $(HOST_COBJS) $(HOST_CCOBJS) $(HOST_CPPOBJS) $(HOST_CMOBJS) $(HOST_CMMOBJS)
|
||||
HOST_OBJS = $(strip $(_HOST_OBJS))
|
||||
endif
|
||||
|
||||
@ -1090,32 +1090,27 @@ endif # MOZ_AUTO_DEPS
|
||||
$(OBJS) $(HOST_OBJS): $(GLOBAL_DEPS)
|
||||
|
||||
# Rules for building native targets must come first because of the host_ prefix
|
||||
host_%.$(OBJ_SUFFIX): %.c
|
||||
$(HOST_COBJS): host_%.$(OBJ_SUFFIX): %.c
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
host_%.$(OBJ_SUFFIX): %.cpp
|
||||
$(HOST_CPPOBJS): host_%.$(OBJ_SUFFIX): %.cpp
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
host_%.$(OBJ_SUFFIX): %.cc
|
||||
$(HOST_CCOBJS): host_%.$(OBJ_SUFFIX): %.cc
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
host_%.$(OBJ_SUFFIX): %.m
|
||||
$(HOST_CMOBJS): host_%.$(OBJ_SUFFIX): %.m
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
host_%.$(OBJ_SUFFIX): %.mm
|
||||
$(HOST_CMMOBJS): host_%.$(OBJ_SUFFIX): %.mm
|
||||
$(REPORT_BUILD)
|
||||
$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
%:: %.c $(GLOBAL_DEPS)
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CC)
|
||||
$(ELOG) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTOPTION)$@ $(_VPATH_SRCS)
|
||||
|
||||
%.$(OBJ_SUFFIX): %.c
|
||||
$(COBJS): %.$(OBJ_SUFFIX): %.c
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CC)
|
||||
$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $(_VPATH_SRCS)
|
||||
@ -1135,26 +1130,22 @@ qrc_%.cpp: %.qrc
|
||||
ifdef ASFILES
|
||||
# The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
|
||||
# a '-c' flag.
|
||||
%.$(OBJ_SUFFIX): %.$(ASM_SUFFIX)
|
||||
$(ASOBJS): %.$(OBJ_SUFFIX): %.$(ASM_SUFFIX)
|
||||
$(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
|
||||
endif
|
||||
|
||||
%.$(OBJ_SUFFIX): %.S
|
||||
$(SOBJS): %.$(OBJ_SUFFIX): %.S
|
||||
$(AS) -o $@ $(ASFLAGS) -c $<
|
||||
|
||||
%:: %.cpp $(GLOBAL_DEPS)
|
||||
@$(MAKE_DEPS_AUTO_CXX)
|
||||
$(CCC) $(OUTOPTION)$@ $(CXXFLAGS) $(_VPATH_SRCS) $(LDFLAGS)
|
||||
|
||||
#
|
||||
# Please keep the next two rules in sync.
|
||||
#
|
||||
%.$(OBJ_SUFFIX): %.cc
|
||||
$(CCOBJS): %.$(OBJ_SUFFIX): %.cc
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CXX)
|
||||
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
%.$(OBJ_SUFFIX): %.cpp
|
||||
$(CPPOBJS): %.$(OBJ_SUFFIX): %.cpp
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CXX)
|
||||
ifdef STRICT_CPLUSPLUS_SUFFIX
|
||||
@ -1165,12 +1156,12 @@ else
|
||||
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
|
||||
endif #STRICT_CPLUSPLUS_SUFFIX
|
||||
|
||||
$(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm
|
||||
$(CMMOBJS): $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CXX)
|
||||
$(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
$(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m
|
||||
$(CMOBJS): $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m
|
||||
$(REPORT_BUILD)
|
||||
@$(MAKE_DEPS_AUTO_CC)
|
||||
$(ELOG) $(CC) -o $@ -c $(COMPILE_CFLAGS) $(COMPILE_CMFLAGS) $(_VPATH_SRCS)
|
||||
|
||||
@ -52,24 +52,26 @@ DIRS = \
|
||||
$(NULL)
|
||||
|
||||
|
||||
SIMPLE_PROGRAMS = \
|
||||
TestIncrementalDownload$(BIN_SUFFIX) \
|
||||
TestStreamLoader$(BIN_SUFFIX) \
|
||||
PropertiesTest$(BIN_SUFFIX) \
|
||||
urltest$(BIN_SUFFIX) \
|
||||
TestCallbacks$(BIN_SUFFIX) \
|
||||
TestPageLoad$(BIN_SUFFIX) \
|
||||
TestURLParser$(BIN_SUFFIX) \
|
||||
TestStandardURL$(BIN_SUFFIX) \
|
||||
TestUpload$(BIN_SUFFIX) \
|
||||
TestBlockingSocket$(BIN_SUFFIX) \
|
||||
TestDNS$(BIN_SUFFIX) \
|
||||
TestOpen$(BIN_SUFFIX) \
|
||||
TestCookie$(BIN_SUFFIX) \
|
||||
TestServ$(BIN_SUFFIX) \
|
||||
ReadNTLM$(BIN_SUFFIX) \
|
||||
TestProtocols$(BIN_SUFFIX) \
|
||||
$(NULL)
|
||||
CPPSRCS = \
|
||||
TestIncrementalDownload.cpp \
|
||||
TestStreamLoader.cpp \
|
||||
PropertiesTest.cpp \
|
||||
urltest.cpp \
|
||||
TestCallbacks.cpp \
|
||||
TestPageLoad.cpp \
|
||||
TestURLParser.cpp \
|
||||
TestStandardURL.cpp \
|
||||
TestUpload.cpp \
|
||||
TestBlockingSocket.cpp \
|
||||
TestDNS.cpp \
|
||||
TestOpen.cpp \
|
||||
TestCookie.cpp \
|
||||
TestServ.cpp \
|
||||
ReadNTLM.cpp \
|
||||
TestProtocols.cpp \
|
||||
$(NULL)
|
||||
|
||||
SIMPLE_PROGRAMS := $(CPPSRCS:.cpp=$(BIN_SUFFIX))
|
||||
|
||||
# XXX Make this work in libxul builds.
|
||||
#SIMPLE_PROGRAMS += \
|
||||
|
||||
@ -56,9 +56,6 @@ CPPSRCS = \
|
||||
snappy.cc \
|
||||
snappy-sinksource.cc \
|
||||
snappy-stubs-internal.cc \
|
||||
$(NULL)
|
||||
|
||||
CSRCS = \
|
||||
snappy-c.cc \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -58,16 +58,24 @@ SIMPLE_PROGRAMS = \
|
||||
$(SIMPLECPPSRCS:.cpp=$(BIN_SUFFIX)) \
|
||||
$(NULL)
|
||||
|
||||
CSRCS = \
|
||||
spacetrace.c \
|
||||
spacecategory.c \
|
||||
formdata.c \
|
||||
$(NULL)
|
||||
EXTRACSRCS = tmreader.c
|
||||
EXTRACPPSRCS = adreader.cpp
|
||||
|
||||
ifndef MOZ_PROFILE_GENERATE
|
||||
PROGRAM = spacetrace$(BIN_SUFFIX)
|
||||
|
||||
PROGCSRCS = \
|
||||
spacetrace.c \
|
||||
spacecategory.c \
|
||||
formdata.c \
|
||||
$(NULL)
|
||||
|
||||
PROGOBJS = $(PROGCSRCS:.c=.$(OBJ_SUFFIX))
|
||||
endif
|
||||
|
||||
CSRCS = $(SIMPLECSRCS) $(EXTRACSRCS) $(PROGCSRCS)
|
||||
CPPSRCS = $(SIMPLECPPSRCS) $(EXTRACPPSRCS)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/config/os2
|
||||
endif
|
||||
@ -111,8 +119,7 @@ DEFINES += \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
EXTRA_DEPS = tmreader.$(OBJ_SUFFIX) adreader.$(OBJ_SUFFIX)
|
||||
GARBAGE += tmreader.$(OBJ_SUFFIX) adreader.$(OBJ_SUFFIX)
|
||||
EXTRA_DEPS = $(EXTRACSRCS:.c=.$(OBJ_SUFFIX)) $(EXTRACPPSRCS:.cpp=.$(OBJ_SUFFIX))
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -50,10 +50,11 @@ MODULE = xremoteclient
|
||||
LIBRARY_NAME = xremote_client_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
|
||||
DEFINES += -DXPCOM_GLUE
|
||||
|
||||
CPPSRCS += XRemoteClient.cpp
|
||||
LIBCPPSRCS = XRemoteClient.cpp
|
||||
|
||||
OBJS = $(LIBCPPSRCS:.cpp=.$(OBJ_SUFFIX))
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(XLIBS) $(XLDFLAGS) \
|
||||
@ -62,15 +63,17 @@ EXTRA_DSO_LDOPTS = \
|
||||
|
||||
PROGRAM = mozilla-xremote-client$(BIN_SUFFIX)
|
||||
|
||||
PROGOBJS = mozilla-xremote-client.$(OBJ_SUFFIX) \
|
||||
XRemoteClient_standalone.$(OBJ_SUFFIX) \
|
||||
$(NULL)
|
||||
PROGCPPSRCS = \
|
||||
mozilla-xremote-client.cpp \
|
||||
XRemoteClient.cpp \
|
||||
$(NULL)
|
||||
|
||||
PROGOBJS = $(PROGCPPSRCS:.cpp=.$(OBJ_SUFFIX))
|
||||
|
||||
CPPSRCS = $(filter-out $(LIBCPPSRCS),$(PROGCPPSRCS)) $(LIBCPPSRCS)
|
||||
|
||||
LIBS = \
|
||||
$(NSPR_LIBS) \
|
||||
$(XLDFLAGS) $(XLIBS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
XRemoteClient_standalone.$(OBJ_SUFFIX): XRemoteClient.cpp
|
||||
$(CXX) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $<
|
||||
|
||||
Loading…
Reference in New Issue
Block a user