Merge branch 'feature/gbuild_extensions'

Conflicts:
extensions/source/ole/servreg.cxx
extensions/source/plugin/util/makefile.mk
postprocess/packcomponents/makefile.mk
postprocess/prj/build.lst
tail_build/prj/build.lst

3 files changed, 18 insertions, 17 deletions

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1b1714e8ef67..20726df8ae1c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -165,28 +165,29 @@ my_components = \
 
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
 my_components += \
-    abp \
-    bib \
     component/desktop/source/deployment/deployment \
     component/desktop/source/deployment/gui/deploymentgui \
     component/desktop/source/migration/services/migrationoo2 \
     component/desktop/source/migration/services/migrationoo3 \
     component/desktop/source/offacc/offacc \
     component/desktop/source/splash/spl \
+    component/extensions/source/abpilot/abp \
+    component/extensions/source/bibliography/bib \
+    component/extensions/source/dbpilots/dbp \
+    component/extensions/source/logging/log \
+    component/extensions/source/propctrlr/pcr \
+    component/extensions/source/resource/res \
+    component/extensions/source/scanner/scn \
+    component/extensions/source/update/check/updchk.uno \
+    component/extensions/source/update/feed/updatefeed \
+    component/extensions/source/update/ui/updchk \
+    component/extensions/source/xmlextract/xmx \
     component/fpicker/source/generic/fpicker \
     component/fpicker/source/office/fps_office \
-    dbp \
-    log \
-    pcr \
-    res \
-    scn \
     syssh \
     tvhlp1 \
     ucpchelp1 \
-    updatefeed \
-    updchk \
-    updchk.uno \
-    xmx
+
 .ENDIF
 
 .IF "$(DISABLE_PYTHON)" != "TRUE"
@@ -268,11 +269,11 @@ my_components += \
 .END
 
 .IF "$(WITH_LDAP)" == "YES"
-my_components += ldapbe2
+my_components += component/extensions/source/config/ldap/ldapbe2
 .END
 
 .IF "$(WITH_MOZILLA)" != "NO"
-my_components += pl
+my_components += component/extensions/source/plugin/pl
 .END
 
 .IF "$(ENABLE_XMLSEC)" == "YES"
@@ -321,7 +322,7 @@ my_components += \
 .IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == ""
 my_components += \
     emser \
-    oleautobridge
+    component/extensions/source/ole/oleautobridge
 .END
 
 .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 84cbfa114f59..2041bbda8ee6 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -356,8 +356,8 @@ MY_FILES_math = \
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
 MY_DEPS_onlineupdate = main
 MY_FILES_onlineupdate = \
-    $(MY_MOD)/org/openoffice/Office/Addons/Addons-onlineupdate.xcu \
-    $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu
+    $(MY_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \
+    $(MY_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu
 .ENDIF
 
 MY_DEPS_palm = main
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index d28537771dc9..47992b2ce6fc 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm DESKTOP:extensions extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL