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

Merge from trunk.

Browse Source 
Not part of the build.  Global a= for this part of the tree.


git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_0_BRANCH@120628 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2002-05-03 01:32:51 +00:00
parent afd9deff38
commit 344a2a950f
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/extensions/python/xpcom/src/Makefile.in
View File

@@ -40,31 +40,23 @@ DEPTH=../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
PYTHON_INCLUDES = @MOZ_PYTHON_INCLUDES@
PYTHON_LIBS = @MOZ_PYTHON_LIBS@
PYTHON_DEBUG_SUFFIX = @MOZ_PYTHON_DEBUG_SUFFIX@
PYTHON_DLL_SUFFIX = @MOZ_PYTHON_DLL_SUFFIX@
DIRS = loader $(NULL)
include $(DEPTH)/config/autoconf.mk
PYTHON_DEBUG_SUFFIX=
ifdef MOZ_DEBUG
ifeq ($(OS_ARCH),WINNT)
PYTHON_DEBUG_SUFFIX=_d
endif
endif
MODULE = pyxpcom
LIBRARY_NAME = _xpcom$(PYTHON_DEBUG_SUFFIX)
#MODULE_NAME =
REQUIRES = xpcom string $(NULL)
ifeq ($(OS_ARCH),WINNT)
DLL_SUFFIX=.pyd
LOCAL_INCLUDES = -I$(PYTHON_SRC)/Include -I$(PYTHON_SRC)/PC
EXTRA_LIBS += /libpath:$(PYTHON_SRC)/PCBuild
else
LOCAL_INCLUDES = -I$(PYTHON_SRC)/include/python2.1
EXTRA_LIBS += -L$(PYTHON_SRC)/lib -lpython2.1
endif
DLL_SUFFIX=$(PYTHON_DLL_SUFFIX)
LOCAL_INCLUDES = $(PYTHON_INCLUDES)
EXTRA_LIBS += $(PYTHON_LIBS)
CPPSRCS= \
ErrorUtils.cpp \
@@ -109,4 +101,4 @@ endif
rm -f $(DIST)/lib/$(IMPORT_LIBRARY)
clobber::
rm -f *.ilk
rm -f *.ilk *.pdb

18
mozilla/extensions/python/xpcom/src/loader/Makefile.in
View File

@@ -41,23 +41,18 @@ DEPTH=../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
PYTHON_INCLUDES = @MOZ_PYTHON_INCLUDES@
PYTHON_LIBS = @MOZ_PYTHON_LIBS@
PYTHON_VER_DOTTED = @MOZ_PYTHON_VER_DOTTED@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_DEBUG
PYTHON_DEBUG_SUFFIX=_d
else
PYTHON_DEBUG_SUFFIX=
endif
MODULE = pyloader
LIBRARY_NAME = pyloader$(PYTHON_DEBUG_SUFFIX)
LIBRARY_NAME = pyloader
IS_COMPONENT = 1
#MODULE_NAME =
REQUIRES = xpcom string $(NULL)
LOCAL_INCLUDES = -I$(PYTHON_SRC)/Include -I$(PYTHON_SRC)/PC
EXTRA_LIBS += /libpath:$(PYTHON_SRC)/PCBuild
LOCAL_INCLUDES = $(PYTHON_INCLUDES)
EXTRA_LIBS += $(PYTHON_LIBS)
CPPSRCS = \
pyloader.cpp \
@@ -66,6 +61,7 @@ CPPSRCS = \
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
CXXFLAGS += -DPYTHON_SO=\"libpython$(PYTHON_VER_DOTTED).so\"
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
clobber::