summaryrefslogtreecommitdiff
path: root/odk/util/makefile.mk
diff options
context:
space:
mode:
authorJuergen Schmidt <jsc@openoffice.org>2002-05-31 14:42:19 +0000
committerJuergen Schmidt <jsc@openoffice.org>2002-05-31 14:42:19 +0000
commit9f3e97046554c1ee71a412ac9b9c51e0f97982ee (patch)
tree71837ac9d0c7ded09b745f172c62d198149c92f5 /odk/util/makefile.mk
parentfac3fac9899f57cca715c46b9cba7803ee9a9fe9 (diff)
#99053# restructure (new targets, new dependencies)
Diffstat (limited to 'odk/util/makefile.mk')
-rw-r--r--odk/util/makefile.mk43
1 files changed, 23 insertions, 20 deletions
diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index aa9a0fcdbc05..c4ff7658fd0a 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -7,31 +7,34 @@ TARGET=odk
.INCLUDE: makefile.pmk
# ------------------------------------------------------------------
-all: zipit
-
.IF "$(BUILD_SOSL)"==""
-# for SUN build without minor
-
-zipit .SETDIR=$(DESTDIR)$/.. .PHONY:
- .IF "$(OS)"=="WNT"
- +zip -ur $(ODKNAME).zip $(ODKNAME)
- .ELIF "$(GUI)"=="UNX"
-# tar does not properly support update
- +tar cf - $(ODKNAME) | gzip - > $(ODKNAME).tar.gz
- .ENDIF
+# for SUN build
+ZIPFILE=$(ODKZIPFILE)
+TARGZFILE=$(ODKTARGZFILE)
+ZIPDIR=$(ODKNAME)
+.ELSE
+# for OO build
+ZIPFILE=$(PRODUCTZIPFILE)
+TARGZFILE=$(PRODUCTTARGZFILE)
+ZIPDIR=$(PRODUCT_NAME)
+.ENDIF
+.IF "$(OS)"=="WNT"
+all:\
+ $(BIN)$/$(ZIPFILE)
.ELSE
-# for OpenOffice build with minor
+all:\
+ $(BIN)$/$(TARGZFILE)
+.ENDIF
-zipit .SETDIR=$(DESTDIR)$/.. .PHONY:
- .IF "$(OS)"=="WNT"
- +zip -ur $(PRODUCT_NAME).zip $(PRODUCT_NAME)
- .ELIF "$(GUI)"=="UNX"
-# tar does not properly support update
- +tar cf - $(PRODUCT_NAME) | gzip - > $(PRODUCT_NAME).tar.gz
- .ENDIF
-.ENDIF
+$(BIN)$/$(ZIPFILE) .SETDIR=$(DESTDIR)$/.. .PHONY:
+ +zip -ur $(ZIPFILE) $(ZIPDIR)
+
+$(BIN)$/$(TARGZFILE) .SETDIR=$(DESTDIR)$/.. .PHONY:
+# tar does not properly support update
+ +tar cf - $(ZIPDIR) | gzip - > $(TARGZFILE)
+