Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv30878/debian
Modified Files:
rules
Log Message:
fix bogus commit
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- rules 30 Apr 2004 11:42:02 -0000 1.201
+++ rules 30 Apr 2004 11:45:07 -0000 1.202
@@ -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
solver.nwf instsetoo
+stampdir_targets+=build.prepare configure bootstrap solver solver.langpacks
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)/file-bug-*.bmp
+ $(OOO_BUILD)/src/open*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 $(STAMP_DIR)/solver.nwf
+build-arch: $(STAMP_DIR)/instsetoo
build-indep: $(STAMP_DIR)/setupins
# All 'important' targets have 2 lines. The one that is run by
@@ -660,16 +660,6 @@
< /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 \
@@ -715,17 +705,6 @@
# 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 $@
