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

Bug 129216: Integrate Python xpcom bindings with build system

Browse Source 
Should not affect the default build!
r=benjamin, rs=brendan


git-svn-id: svn://10.0.0.236/trunk@193127 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2006-03-28 10:57:18 +00:00
parent 32b98f861f
commit 3d10f65f51
9 changed files with 91 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,6 @@ DEPTH=../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
pyexecdir = @libdir@/python$(PYTHON_VER_DOTTED)/site-packages
DIRS = module loader $(NULL)
@@ -55,8 +54,8 @@ MOZILLA_INTERNAL_API = 1
FORCE_SHARED_LIB = 1
FORCE_USE_PIC = 1
LOCAL_INCLUDES = $(PYTHON_INCLUDES)
EXTRA_LIBS += $(PYTHON_LIBS)
LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES)
EXTRA_LIBS += $(MOZ_PYTHON_LIBS)
EXPORTS = PyXPCOM.h

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

@@ -51,9 +51,9 @@ MOZILLA_INTERNAL_API = 1
FORCE_SHARED_LIB = 1
FORCE_USE_PIC = 1
LOCAL_INCLUDES = $(PYTHON_INCLUDES)
LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES)
EXTRA_LIBS += $(PYTHON_LIBS)
EXTRA_LIBS += $(MOZ_PYTHON_LIBS)
ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += $(DIST)/lib/pyxpcom.lib
@@ -69,7 +69,7 @@ CPPSRCS = \
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
CXXFLAGS += -DPYTHON_SO=\"libpython$(PYTHON_VER_DOTTED).so\"
CXXFLAGS += -DPYTHON_SO=\"libpython$(MOZ_PYTHON_VER_DOTTED).so\"
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
clobber::

12
mozilla/extensions/python/xpcom/src/module/Makefile.in
View File

@@ -41,20 +41,20 @@ DEPTH=../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
pyexecdir = @libdir@/python$(PYTHON_VER_DOTTED)/site-packages
pyexecdir = @libdir@/python$(MOZ_PYTHON_VER_DOTTED)/site-packages
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = _xpcom$(PYTHON_DEBUG_SUFFIX)
LIBRARY_NAME = _xpcom$(MOZ_PYTHON_DEBUG_SUFFIX)
REQUIRES = pyxpcom xpcom string $(NULL)
MOZILLA_INTERNAL_API = 1
FORCE_SHARED_LIB = 1
FORCE_USE_PIC = 1
DLL_SUFFIX=$(PYTHON_DLL_SUFFIX)
LOCAL_INCLUDES = $(PYTHON_INCLUDES)
DLL_SUFFIX=$(MOZ_PYTHON_DLL_SUFFIX)
LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES)
EXTRA_LIBS += $(PYTHON_LIBS)
EXTRA_LIBS += $(MOZ_PYTHON_LIBS)
ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += $(DIST)/lib/pyxpcom.lib
@@ -92,7 +92,7 @@ endif
install::
ifneq ($(OS_ARCH),WINNT)
$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom
mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(PYTHON_DLL_SUFFIX)
mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX)
endif
clobber::