summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odk/pack/copying/makefile.mk22
-rw-r--r--odk/prj/build.lst7
2 files changed, 27 insertions, 2 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 404bbac02a9b..8e3270c0d142 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -32,6 +32,9 @@ DIRLIST = \
$(DESTDIRJAVAEXAMPLES)$/Inspector \
$(DESTDIRJAVAEXAMPLES)$/NotesAccess \
$(DESTDIRJAVAEXAMPLES)$/ToDo \
+ $(DESTDIRJAVAEXAMPLES)$/OfficeBean \
+ $(DESTDIRJAVAEXAMPLES)$/OfficeBean/SimpleBean \
+ $(DESTDIRJAVAEXAMPLES)$/OfficeBean/FontWizard \
$(DESTDIRJAVAEXAMPLES)$/WriterSelector \
$(DESTDIRBASICEXAMPLES) \
$(DESTDIRBASICEXAMPLES)$/drawing \
@@ -206,6 +209,15 @@ JAVA_WRITERSELECTOR= \
$(DESTDIRJAVAEXAMPLES)$/WriterSelector$/makefile.mk \
$(DESTDIRJAVAEXAMPLES)$/WriterSelector$/README
+JAVA_OFFICEBEAN_SIMPLEBEAN= \
+ $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/SimpleBean$/SimpleBean.java \
+ $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/SimpleBean$/Makefile
+
+JAVA_OFFICEBEAN_FONTWIZARD= \
+ $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/FontWizard$/Wizard.java \
+ $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/FontWizard$/WizardDialog.java \
+ $(DESTDIRJAVAEXAMPLES)$/OfficeBean$/FontWizard$/Makefile
+
BASIC_EXAMPLES= \
$(DESTDIRBASICEXAMPLES)$/drawing$/dirtree.txt \
$(DESTDIRBASICEXAMPLES)$/drawing$/importexportofasciifiles.sxd \
@@ -260,6 +272,8 @@ EXAMPLESLIST= \
$(JAVA_NOTESACCESS) \
$(JAVA_TODO) \
$(JAVA_WRITERSELECTOR) \
+ $(JAVA_OFFICEBEAN_SIMPLEBEAN) \
+ $(JAVA_OFFICEBEAN_FONTWIZARD) \
$(BASIC_EXAMPLES) \
$(OLE_EXAMPLES) \
$(OLE_EXAMPLES_DELPHI) \
@@ -278,8 +292,10 @@ all : \
$(EXAMPLESLIST) \
$(DESTIDLLIST) \
$(DESTDIRBIN)$/applicat.rdb \
+ $(DESTDIRLIB)$/libofficebean.so \
$(DESTDIR)$/settings$/dk.mk \
$(DESTDIR)$/classes$/unoil.jar \
+ $(DESTDIR)$/classes$/officebean.jar \
$(DESTDIR)$/odk_overview.html \
convert_links
@@ -317,9 +333,15 @@ $(DESTDIROLEEXAMPLES)$/% : $(PRJ)$/examples$/OLE$/% $(DIRLIST) $(BIN)$/$(UDKNAME
$(DESTDIR)$/classes$/unoil.jar : $(BINOUT)$/unoil.jar
$(GNUCOPY) -p $? $@
+$(DESTDIR)$/classes$/officebean.jar : $(OUT)$/class$/officebean.jar
+ $(GNUCOPY) -p $? $@
+
$(DESTDIRBIN)$/applicat.rdb : $(BINOUT)$/applicat.rdb
$(GNUCOPY) -p $(BINOUT)$/applicat.rdb $@
+$(DESTDIRLIB)$/libofficebean.so : $(OUT)$/lib$/libofficebean.so
+ $(GNUCOPY) -p $? $@
+
$(DESTDIR)$/settings$/dk.mk : $(PRJ)$/util$/dk.mk
+-rm -f $@ >& $(NULLDEV)
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/util$/dk.mk $(MY_TEXTCOPY_TARGETPRE) $@
diff --git a/odk/prj/build.lst b/odk/prj/build.lst
index 7407c76e43ef..3265cd875641 100644
--- a/odk/prj/build.lst
+++ b/odk/prj/build.lst
@@ -2,9 +2,12 @@ od odk : offapi product vos unoil NULL
od odk usr1 - all od_mkout NULL
od odk\examples\cpp\officeclient nmake - all od_offclient NULL
od odk\examples\java\com\sun\star\comp\demo nmake - all od_javaDemoComp NULL
+od odk\source\bean\src\com\sun\star\beans nmake - all od_beanjava NULL
+od odk\source\bean\src\native\win32 nmake - n od_beanwin32 NULL
+od odk\source\bean\src\native\unix nmake - u od_beanunix NULL
od odk\pack\unzip_udk nmake - all od_unzip_udk NULL
-od odk\pack\copying nmake - all od_copying od_unzip_udk NULL
+od odk\pack\copying nmake - all od_copying od_unzip_udk od_beanjava od_beanwin32.n od_beanunix.u NULL
od odk\pack\checkinc nmake - all od_checkinc od_unzip_udk NULL
od odk\pack\checkinc2 nmake - all od_checkinc2 od_unzip_udk NULL
od odk\pack\checkbin nmake - all od_checkbin od_unzip_udk NULL
-od odk\util nmake - all od_util od_copying od_javaDemoComp NULL
+od odk\util nmake - all od_util od_copying od_javaDemoComp od_beanjava od_beanwin32.n od_beanunix.u NULL