Fixed my breakage.
git-svn-id: svn://10.0.0.236/trunk@47722 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -29,22 +29,22 @@ REQUIRES = xpcom
|
||||
CPPSRCS = nsTimerMotif.cpp
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
|
||||
TIMER_SUFFIX = motif
|
||||
IS_COMPONENT = 1
|
||||
CPPSRCS += nsTimerMotifFactory.cpp
|
||||
INCLUDES += $(MOZ_MOTIF_CFLAGS) -I$(srcdir)/..
|
||||
EXTRA_DSO_LDOPTS = $(MOZ_MOTIF_LDFLAGS)
|
||||
|
||||
else
|
||||
|
||||
TIMER_SUFFIX = s
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
INCLUDES += $(MOZ_MOTIF_CFLAGS) -I$(srcdir)/..
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
endif
|
||||
|
||||
|
||||
@@ -33,22 +33,22 @@ CPPSRCS = \
|
||||
$(NULL)
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
|
||||
TIMER_SUFFIX = qt
|
||||
IS_COMPONENT = 1
|
||||
CPPSRCS += nsTimerQtFactory.cpp
|
||||
INCLUDES += $(MOZ_QT_CFLAGS) -I$(srcdir)/..
|
||||
EXTRA_DSO_LDOPTS = $(MOZ_QT_LDFLAGS)
|
||||
|
||||
else
|
||||
|
||||
TIMER_SUFFIX = s
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
INCLUDES += $(MOZ_QT_CFLAGS) -I$(srcdir)/..
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
endif
|
||||
|
||||
|
||||
@@ -29,22 +29,22 @@ REQUIRES = xpcom
|
||||
CPPSRCS = nsTimerXlib.cpp
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
|
||||
TIMER_SUFFIX = xlib
|
||||
IS_COMPONENT = 1
|
||||
CPPSRCS += nsTimerXlibFactory.cpp
|
||||
INCLUDES += $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
|
||||
EXTRA_DSO_LDOPTS = $(MOZ_XLIB_LDFLAGS)
|
||||
|
||||
else
|
||||
|
||||
TIMER_SUFFIX = s
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
INCLUDES += $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user