summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-12-24 13:37:11 +0100
committerDavid Tardon <dtardon@redhat.com>2011-12-24 22:21:01 +0100
commit80c8e6fb03fb455fdebab4492ce04ff9cf695c38 (patch)
treea23ebeb55591aa43492c5bd77968f85f5ab2ceea /odk
parentc77a11e1425280d29b061d10d5fb88e174a3841f (diff)
gbuildize javaunohelper
Diffstat (limited to 'odk')
-rw-r--r--odk/pack/gendocu/makefile.mk15
1 files changed, 3 insertions, 12 deletions
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 915d95660fbc..5f9f86aee25c 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -52,16 +52,12 @@ JAVA_PACKAGES=\
$(JAVA_SRC_DIR)$/com$/sun$/star$/lib$/util$/UrlToFileMapper.java
# com.sun.star.beans \
-JAVA_SRC_FILES_BIN=\
- $(JAVA_SRC_DIR)$/juh_src.zip
-
-JAVA_SRC_FILES_PCK=\
+JAVA_SRC_FILES=\
+ $(JAVA_SRC_DIR)$/juh_src.zip \
$(JAVA_SRC_DIR)$/jurt_src.zip \
$(JAVA_SRC_DIR)$/ridl_src.zip \
$(JAVA_SRC_DIR)$/unoloader_src.zip
-JAVA_SRC_FILES=$(JAVA_SRC_FILES_BIN) $(JAVA_SRC_FILES_PCK)
-
JAVA_BEAN_SRC_FILES=\
$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/ContainerFactory.java \
$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/JavaWindowPeerFake.java \
@@ -105,12 +101,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG)
-rm $(@:d:d)$/cpp.css
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
-$(JAVA_SRC_FILES_BIN) : $(SOLARCOMMONBINDIR)$/$$(@:f)
- -$(MKDIRHIER) $(@:d)
- $(MY_COPY) $< $@
- cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)
-
-$(JAVA_SRC_FILES_PCK) : $(SOLARCOMMONPCKDIR)$/$$(@:f)
+$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f)
-$(MKDIRHIER) $(@:d)
$(MY_COPY) $< $@
cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)