Lines 298-303
DIRLIST = \
Link Here
|
298 |
$(DESTDIRXML) \ |
298 |
$(DESTDIRXML) \ |
299 |
$(DESTDIRINC) \ |
299 |
$(DESTDIRINC) \ |
300 |
$(DESTDIRSETTINGS) \ |
300 |
$(DESTDIRSETTINGS) \ |
|
|
301 |
$(DESTDIREXAMPLES) \ |
301 |
$(DESTDIREXAMPLESCPP) \ |
302 |
$(DESTDIREXAMPLESCPP) \ |
302 |
$(DESTDIREXAMPLESCPP)$/remoteclient \ |
303 |
$(DESTDIREXAMPLESCPP)$/remoteclient \ |
303 |
$(DESTDIREXAMPLESCPP)$/counter \ |
304 |
$(DESTDIREXAMPLESCPP)$/counter \ |
Lines 428-459
ADDITIONALFILELIST= \
Link Here
|
428 |
# TARGETS |
429 |
# TARGETS |
429 |
#-------------------------------------------------- |
430 |
#-------------------------------------------------- |
430 |
ALLTARGETS = \ |
431 |
ALLTARGETS = \ |
431 |
$(MISC)$/deltree.txt \ |
|
|
432 |
$(DIRLIST) \ |
433 |
$(FILELIST) |
432 |
$(FILELIST) |
434 |
|
433 |
|
435 |
.IF "$(GUI)"=="WNT" |
434 |
.IF "$(GUI)"=="WNT" |
436 |
ALLTARGETS+= \ |
435 |
ALLTARGETS+= \ |
437 |
$(BIN)$/$(ODK_PARTZIPFILE) |
436 |
$(BIN)$/$(ODK_PARTZIPFILE) \ |
438 |
.ELSE |
|
|
439 |
ALLTARGETS+= \ |
440 |
$(BIN)$/$(ODK_PARTTARGZFILE) |
441 |
.ENDIF |
442 |
|
443 |
.IF "$(BUILD_SOSL)"!="" |
444 |
#for OpenOffice build additionally a complete UDK |
445 |
ALLTARGETS+= \ |
446 |
$(ADDITIONALFILELIST) |
447 |
.ENDIF |
448 |
|
449 |
.IF "$(GUI)"=="WNT" |
450 |
ALLTARGETS+= \ |
451 |
$(BIN)$/$(PRODUCTZIPFILE) |
437 |
$(BIN)$/$(PRODUCTZIPFILE) |
452 |
.ELSE |
438 |
.ELSE |
453 |
ALLTARGETS+= \ |
439 |
ALLTARGETS+= \ |
|
|
440 |
$(BIN)$/$(ODK_PARTTARGZFILE) \ |
454 |
$(BIN)$/$(PRODUCTTARGZFILE) |
441 |
$(BIN)$/$(PRODUCTTARGZFILE) |
455 |
.ENDIF |
442 |
.ENDIF |
456 |
|
|
|
457 |
|
443 |
|
458 |
all: \ |
444 |
all: \ |
459 |
$(ALLTARGETS) |
445 |
$(ALLTARGETS) |
Lines 468-492
$(MISC)$/deltree.txt : deltree.txt
Link Here
|
468 |
$(DIRLIST) : $(MISC)$/deltree.txt |
454 |
$(DIRLIST) : $(MISC)$/deltree.txt |
469 |
$(MKDIRHIER) $@ |
455 |
$(MKDIRHIER) $@ |
470 |
|
456 |
|
471 |
$(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb |
457 |
$(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb $(DESTDIRBIN) |
472 |
$(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@ |
458 |
$(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@ |
473 |
|
459 |
|
|
|
460 |
$(FILELIST) : $(DIRLIST) |
461 |
|
462 |
$(ADDITIONALFILELIST) : $(DIRLIST) |
463 |
|
474 |
.IF "$(STLPORTDEST)" != "" |
464 |
.IF "$(STLPORTDEST)" != "" |
475 |
#OOo build environment |
465 |
#OOo build environment |
476 |
$(STLPORTDEST) : $(STLPORTOUT) |
466 |
$(STLPORTDEST) : $(STLPORTOUT) |
477 |
$(GNUCOPY) -p $(STLPORTOUT) $@ |
467 |
$(GNUCOPY) -p $(STLPORTOUT) $@ |
478 |
.ENDIF |
468 |
.ENDIF |
479 |
|
469 |
|
480 |
$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) $(DIRLIST) |
470 |
$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) $(DESTDIRBIN) |
481 |
$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ |
471 |
$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ |
482 |
|
472 |
|
483 |
$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(DIRLIST) |
473 |
$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(DESTDIRDLL) |
484 |
$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ |
474 |
$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ |
485 |
|
475 |
|
486 |
$(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) |
476 |
$(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX) $(DESTDIRDLL) |
487 |
$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ |
477 |
$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ |
488 |
|
478 |
|
489 |
$(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) |
479 |
$(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DESTDIRDLL) |
490 |
-rm -f $@ |
480 |
-rm -f $@ |
491 |
-rm -f $(@:db) |
481 |
-rm -f $(@:db) |
492 |
+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ |
482 |
+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ |
Lines 502-512
$(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) :
Link Here
|
502 |
$(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) |
492 |
$(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) |
503 |
|
493 |
|
504 |
# Otherwise you get circular dependencies |
494 |
# Otherwise you get circular dependencies |
505 |
$(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) : $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $(DIRLIST) |
495 |
$(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) : $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $(DESTDIRDLL) |
506 |
-rm -f $@ |
496 |
-rm -f $@ |
507 |
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $@ |
497 |
$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $@ |
508 |
|
498 |
|
509 |
$(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) : $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) $(DIRLIST) |
499 |
$(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) : $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) $(DESTDIRDLL) |
510 |
-rm -f $@ |
500 |
-rm -f $@ |
511 |
+ln -s libstdc++.so.$(LIBSTDCPP3) $@ |
501 |
+ln -s libstdc++.so.$(LIBSTDCPP3) $@ |
512 |
.ENDIF |
502 |
.ENDIF |
Lines 514-559
$(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCP
Link Here
|
514 |
$(DLLOUT)$/libgcc_s.so.1 : |
504 |
$(DLLOUT)$/libgcc_s.so.1 : |
515 |
$(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT) |
505 |
$(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT) |
516 |
|
506 |
|
517 |
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) |
507 |
$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DESTDIRDLL) |
518 |
-rm -f $@ |
508 |
-rm -f $@ |
519 |
$(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@ |
509 |
$(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@ |
520 |
|
510 |
|
521 |
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) |
511 |
$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DESTDIRDLL) |
522 |
-rm -f $@ |
512 |
-rm -f $@ |
523 |
+ln -s libgcc_s.so.1 $@ |
513 |
+ln -s libgcc_s.so.1 $@ |
524 |
#------------------------------------------------------------- |
514 |
#------------------------------------------------------------- |
525 |
|
515 |
|
526 |
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) |
516 |
$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DESTDIRJAR) |
527 |
$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ |
517 |
$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ |
528 |
|
518 |
|
529 |
$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml $(DIRLIST) |
519 |
$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml $(DESTDIRXML) |
530 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ |
520 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/$(@:f) $(MY_TEXTCOPY_TARGETPRE) $@ |
531 |
|
521 |
|
532 |
$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd $(DIRLIST) |
522 |
$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd $(DESTDIRXML) |
533 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@ |
523 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@ |
534 |
|
524 |
|
535 |
$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST) |
525 |
$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DESTDIRLIB) |
536 |
$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@ |
526 |
$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@ |
537 |
|
527 |
|
538 |
$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST) |
528 |
$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DESTDIRSETTINGS) |
539 |
+-rm -f $@ >& $(NULLDEV) |
529 |
+-rm -f $@ >& $(NULLDEV) |
540 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ |
530 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/settings$/$(@:f) $(MY_TEXTCOPY_TARGETPRE) $@ |
541 |
|
531 |
|
542 |
# EXAMPLES CPP RULE |
532 |
# EXAMPLES CPP RULE |
543 |
$(DESTDIREXAMPLESCPP)$/% : $(PRJ)$/examples$/cpp$/% |
533 |
$(DESTDIREXAMPLESCPP)$/% : $(PRJ)$/examples$/cpp$/% $(DESTDIREXAMPLESCPP) |
544 |
+-rm -f $@ >& $(NULLDEV) |
534 |
+-rm -f $@ >& $(NULLDEV) |
545 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ |
535 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) \ |
|
|
536 |
$(subst,$(DESTDIREXAMPLESCPP),$(PRJ)$/examples$/cpp $@) $(MY_TEXTCOPY_TARGETPRE) $@ |
546 |
|
537 |
|
547 |
$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README |
538 |
$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README $(DESTDIREXAMPLES) |
548 |
$(GNUCOPY) -p $(PRJ)$/examples$/README $@ |
539 |
$(GNUCOPY) -p $(PRJ)$/examples$/README $@ |
549 |
|
540 |
|
550 |
$(DESTDIRIDL)$/% : $(IDLOUT)$/% |
541 |
$(DESTDIRIDL)$/% : $(IDLOUT)$/% $(DESTDIRIDL) |
551 |
+-rm -f $@ |
542 |
+-rm -f $@ |
552 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ |
543 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) \ |
|
|
544 |
$(subst,$(DESTDIRIDL),$(IDLOUT) $@) $(MY_TEXTCOPY_TARGETPRE) $@ |
553 |
|
545 |
|
554 |
$(DESTDIRINC)$/% : $(INCOUT)$/% |
546 |
$(DESTDIRINC)$/% : $(INCOUT)$/% $(DESTDIRINC) |
555 |
+-rm -f $@ |
547 |
+-rm -f $@ |
556 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@ |
548 |
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(subst,$(DESTDIRINC),$(INCOUT) $@) $(MY_TEXTCOPY_TARGETPRE) $@ |
557 |
|
549 |
|
558 |
# ------------------------------------------------------------------------------------ |
550 |
# ------------------------------------------------------------------------------------ |
559 |
# ZIP IT |
551 |
# ZIP IT |
Lines 567-578
$(BIN)$/$(ODK_PARTTARGZFILE) : $(DIRLIST
Link Here
|
567 |
+-$(MY_DELETE_RECURSIVE) $(ADDITIONALFILELIST) >& $(NULLDEV) |
559 |
+-$(MY_DELETE_RECURSIVE) $(ADDITIONALFILELIST) >& $(NULLDEV) |
568 |
+-$(RM) $@ |
560 |
+-$(RM) $@ |
569 |
+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) | gzip -c > $(ODK_PARTTARGZFILE) |
561 |
+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) | gzip -c > $(ODK_PARTTARGZFILE) |
570 |
|
562 |
|
571 |
$(BIN)$/$(PRODUCTZIPFILE) : $(BIN)$/$(ODK_PARTZIPFILE) $(ADDITIONALFILELIST) |
563 |
$(BIN)$/$(PRODUCTZIPFILE) .SEQUENTIAL : $(BIN)$/$(ODK_PARTZIPFILE) $(ADDITIONALFILELIST) |
572 |
+-$(RM) $@ |
564 |
+-$(RM) $@ |
573 |
+cd $(DESTDIR)$/.. && zip -9 -r $(PRODUCTZIPFILE) $(PRODUCT_NAME) |
565 |
+cd $(DESTDIR)$/.. && zip -9 -r $(PRODUCTZIPFILE) $(PRODUCT_NAME) |
574 |
|
566 |
|
575 |
$(BIN)$/$(PRODUCTTARGZFILE) : $(BIN)$/$(ODK_PARTTARGZFILE) $(ADDITIONALFILELIST) |
567 |
$(BIN)$/$(PRODUCTTARGZFILE) .SEQUENTIAL : $(BIN)$/$(ODK_PARTTARGZFILE) $(ADDITIONALFILELIST) |
576 |
+-$(RM) $@ |
568 |
+-$(RM) $@ |
577 |
+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) | gzip -c > $(PRODUCTTARGZFILE) |
569 |
+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) | gzip -c > $(PRODUCTTARGZFILE) |
578 |
|
570 |
|