CVS:oo-deb/debian rules,1.200,1.201
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv15423/debian
Modified Files:
rules
Log Message:
remove file-bug-*.bmp in clean
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- rules 22 Apr 2004 06:40:31 -0000 1.200
+++ rules 30 Apr 2004 11:42:02 -0000 1.201
@@ -294,7 +294,7 @@
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
# that match the given targets will be removed automagically.
stampdir_targets=files.backup icons.scale patch.apply build.prepare.artwork
-stampdir_targets+=build.prepare configure bootstrap solver solver.langpacks instsetoo
+stampdir_targets+=build.prepare configure bootstrap solver solver.langpacks solver.nwf instsetoo
stampdir_targets+=setupins setup install-arch install-indep manifest
stampdir_targets+=langpacks binary-common binary-arch binary-indep
ifdef FORCE
@@ -351,7 +351,7 @@
rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png \
$(OOO_BUILD)/www/images/*.png $(OOO_BUILD)/templates/*.s* \
$(OOO_BUILD)/www/l10n/*.gif \
- $(OOO_BUILD)/src/open*bmp
+ $(OOO_BUILD)/src/open*bmp $(OOO_BUILD)/file-bug-*.bmp
if [ -d $(OOO_BUILD)/test ]; then \
find $(OOO_BUILD)/test -type f \
@@ -454,7 +454,7 @@
.DELETE_ON_ERROR: debian/control
build: build-arch build-indep
-build-arch: $(STAMP_DIR)/instsetoo
+build-arch: $(STAMP_DIR)/instsetoo $(STAMP_DIR)/solver.nwf
build-indep: $(STAMP_DIR)/setupins
# All 'important' targets have 2 lines. The one that is run by
@@ -660,6 +660,16 @@
< /dev/null
mv $(SOURCE_TREE)/$(ENVFILE) $(SOURCE_TREE)/$(ENVFILE).langpacks
+ # NWF stuff
+ for w in gtk kde; do \
+ cd $(SOURCE_TREE)/config_office && \
+ CC="$(_CC)" CXX="$(CXX)" sh ./configure \
+ $(CONFIGURE_FLAGS) --with-widgetset=$$w \
+ --with-lang=$(shell debian/local/openoffice-xlate-lang -r $(BUILDLANG)) \
+ < /dev/null && \
+ mv $(SOURCE_TREE)/$(ENVFILE) $(SOURCE_TREE)/$(ENVFILE).$$w; \
+ done
+
# Normal complete build with only one language
cd $(SOURCE_TREE)/config_office && \
CC="$(_CC)" CXX="$(CXX)" sh ./configure \
@@ -705,6 +715,17 @@
# This also builds everything needed for solver target
touch $(STAMP_DIR)/solver
+
+ touch $@
+
+solver.nwf: $(STAMP_DIR)/solver.nwf
+$(STAMP_DIR)/solver.nwf: $(STAMP_DIR)/solver
+ dh_testdir
+ for w in gtk kde; do \
+ rm -rf vcl/$(ARCHBUILDDIR) && \
+ . $(SOURCE_TREE)/$(ENVFILE).$$w; cd $(SOURCE_TREE)/vcl && \
+ $(BUILDCMD) $(BUILDFLAGS); \
+ done
touch $@
Reply to: