Commit aafaa76f authored by Tatiana Meshkova's avatar Tatiana Meshkova

Fixed building in separate obj arch folder

parent b151e466
......@@ -37,26 +37,29 @@ ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
endif
MAKEFLAGS += $(NJOBS)
DEST_OBJ_DIR=objdir-$(DEB_HOST_ARCH)
configure: configure-stamp
configure-stamp:
configure: configure-$(DEB_HOST_ARCH)-stamp
configure-$(DEB_HOST_ARCH)-stamp:
dh_testdir
echo $(DEST_OBJ_DIR) > $(CURDIR)/last_obj_dir
NO_CONFIGURE=yes ./autogen.sh --prefix=/usr
CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
mkdir -p $(CURDIR)/$(DEST_OBJ_DIR)
cd $(DEST_OBJ_DIR) && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
touch configure-stamp
touch configure-$(DEB_HOST_ARCH)-stamp
build: build-stamp
build-stamp: configure-stamp
build: build-$(DEB_HOST_ARCH)-stamp
build-$(DEB_HOST_ARCH)-stamp: configure-$(DEB_HOST_ARCH)-stamp
dh_testdir
$(MAKE)
touch build-stamp
cd $(DEST_OBJ_DIR) && $(MAKE)
touch build-$(DEB_HOST_ARCH)-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
rm -f configure-stamp
rm -f build-$(DEB_HOST_ARCH)-stamp
rm -f configure-$(DEB_HOST_ARCH)-stamp
# $(MAKE) distclean
dh_clean
......@@ -67,7 +70,7 @@ install: build
dh_installdirs -s
# Add here commands to install the package into debian/tmp
$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
cd $(DEST_OBJ_DIR) && $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
dh_install --sourcedir=debian/tmp
......
......@@ -18,5 +18,5 @@ libhistory_la_LIBADD = \
IDL = nsIEmbedLiteHistory
EmbedHistoryListener.cpp: $(IDL).h
$(IDL).h: $(IDL).idl
python $(SDK_DIR)/sdk/bin/header.py -I$(IDL_DIR) -I. ./$(IDL).idl -o $(IDL).h
python $(SDK_DIR)/sdk/bin/typelib.py -I$(IDL_DIR) -I. ./$(IDL).idl -o $(IDL).xpt
python $(SDK_DIR)/sdk/bin/header.py -I$(IDL_DIR) -I. $(srcdir)/$(IDL).idl -o $(IDL).h
python $(SDK_DIR)/sdk/bin/typelib.py -I$(IDL_DIR) -I. $(srcdir)/$(IDL).idl -o $(IDL).xpt
......@@ -6,13 +6,18 @@ if [ "$TARGET_DIR" = "" ]; then
TARGET_DIR=/usr/lib/mozembedlite/components
fi
LAST_OBJ_DIR="."
if [ -f ./last_obj_dir ]; then
LAST_OBJ_DIR=`cat last_obj_dir`
fi
mkdir -p $TARGET_DIR
FILES_LIST="
chromehelper/.libs/libchromehelper.so
history/.libs/libhistory.so
prompt/.libs/libprompt.so
touchhelper/.libs/libtouchhelper.so
$LAST_OBJ_DIR/chromehelper/.libs/libchromehelper.so
$LAST_OBJ_DIR/history/.libs/libhistory.so
$LAST_OBJ_DIR/prompt/.libs/libprompt.so
$LAST_OBJ_DIR/touchhelper/.libs/libtouchhelper.so
EmbedLiteBinComponents.manifest
EmbedLiteJSComponents.manifest
jscomps/AboutRedirector.js
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment