Author: damjan
Date: Thu Dec 22 03:13:55 2016
New Revision: 1775570
URL: http://svn.apache.org/viewvc?rev=1775570&view=rev
Log:
Port main/fpicker to gbuild.
Patch by: me
Added:
openoffice/trunk/main/fpicker/AllLangResTarget_fps_office.mk
openoffice/trunk/main/fpicker/Library_fop.mk
openoffice/trunk/main/fpicker/Library_fpicker.mk
openoffice/trunk/main/fpicker/Library_fps.mk
openoffice/trunk/main/fpicker/Library_fps_aqua.mk
openoffice/trunk/main/fpicker/Library_fps_gnome.mk
openoffice/trunk/main/fpicker/Library_fps_kde4.mk
openoffice/trunk/main/fpicker/Library_fps_office.mk
openoffice/trunk/main/fpicker/Makefile (with props)
openoffice/trunk/main/fpicker/Module_fpicker.mk
openoffice/trunk/main/fpicker/Package_xml.mk
openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk
openoffice/trunk/main/fpicker/prj/makefile.mk
Removed:
openoffice/trunk/main/fpicker/inc/makefile.mk
openoffice/trunk/main/fpicker/source/aqua/makefile.mk
openoffice/trunk/main/fpicker/source/generic/makefile.mk
openoffice/trunk/main/fpicker/source/office/makefile.mk
openoffice/trunk/main/fpicker/source/unx/gnome/makefile.mk
openoffice/trunk/main/fpicker/source/unx/kde4/makefile.mk
openoffice/trunk/main/fpicker/source/win32/filepicker/makefile.mk
openoffice/trunk/main/fpicker/source/win32/filepicker/workbench/makefile.mk
openoffice/trunk/main/fpicker/source/win32/folderpicker/makefile.mk
openoffice/trunk/main/fpicker/source/win32/folderpicker/workbench/makefile.mk
openoffice/trunk/main/fpicker/source/win32/misc/makefile.mk
openoffice/trunk/main/fpicker/util/exports.dxp
openoffice/trunk/main/fpicker/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/fpicker/prj/build.lst
openoffice/trunk/main/fpicker/prj/d.lst
openoffice/trunk/main/fpicker/source/aqua/FPentry.cxx
openoffice/trunk/main/fpicker/source/unx/gnome/FPentry.cxx
openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FPEntry.cxx
openoffice/trunk/main/fpicker/source/win32/filepicker/FPentry.cxx
openoffice/trunk/main/fpicker/source/win32/folderpicker/Fopentry.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Thu Dec 22 03:13:55 2016
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,o
eventattacher \
fileaccess \
formula \
+ fpicker \
framework \
idl \
io \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Thu Dec 22 03:13:55 2016
@@ -178,6 +178,13 @@ $(eval $(call gb_Helper_register_librari
directx9canvas \
expwrap \
fastsax \
+ fop \
+ fpicker \
+ fps \
+ fps_aqua \
+ fps_gnome \
+ fps_kde4 \
+ fps_office \
fsstorage \
gdipluscanvas \
hatchwindowfactory \
Added: openoffice/trunk/main/fpicker/AllLangResTarget_fps_office.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/AllLangResTarget_fps_office.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/AllLangResTarget_fps_office.mk (added)
+++ openoffice/trunk/main/fpicker/AllLangResTarget_fps_office.mk Thu Dec 22
03:13:55 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,fps_office))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,fps_office,fpicker))
+
+$(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
+ fps_office/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
+
+$(eval $(call gb_SrsTarget_set_include,fps_office/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,fps_office/res,\
+ fpicker/source/office/iodlg.src \
+ fpicker/source/office/OfficeFilePicker.src \
+))
+
+
Added: openoffice/trunk/main/fpicker/Library_fop.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fop.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fop.mk (added)
+++ openoffice/trunk/main/fpicker/Library_fop.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,80 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fop))
+
+$(eval $(call gb_Library_set_componentfile,fop,fpicker/util/fop))
+
+$(eval $(call gb_Library_set_include,fop,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fop,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fop,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fop,\
+ advapi32 \
+ gdi32 \
+ ole32 \
+ oleaut32 \
+ shell32 \
+ uwinapi \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fop,\
+ fpicker/source/win32/folderpicker/fopentry \
+ fpicker/source/win32/folderpicker/folderpicker \
+ fpicker/source/win32/folderpicker/WinFopImpl \
+ fpicker/source/win32/folderpicker/MtaFop \
+))
+
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cxxobjects,fop,\
+ fpicker/source/win32/misc/WinImplHelper \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ , -fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE
$(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,fop,\
+ fpicker/source/win32/misc/WinImplHelper \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ , -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+fi
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/fpicker/Library_fpicker.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fpicker.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fpicker.mk (added)
+++ openoffice/trunk/main/fpicker/Library_fpicker.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,55 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fpicker))
+
+$(eval $(call
gb_Library_add_precompiled_header,fpicker,$(SRCDIR)/fpicker/inc/pch/precompiled_fpicker))
+
+$(eval $(call
gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker))
+
+$(eval $(call gb_Library_set_include,fpicker,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fpicker,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fpicker,\
+ cppu \
+ cppuhelper \
+ sal \
+ svl \
+ vcl \
+ svt \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,fpicker,\
+ fpicker/source/generic/fpicker \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/fpicker/Library_fps.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps.mk (added)
+++ openoffice/trunk/main/fpicker/Library_fps.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,104 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps))
+
+$(eval $(call gb_Library_set_componentfile,fps,fpicker/util/fps))
+
+$(eval $(call gb_Library_set_include,fps,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fps,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps,\
+ advapi32 \
+ comdlg32 \
+ gdi32 \
+ kernel32 \
+ ole32 \
+ oleaut32 \
+ shell32 \
+ uuid \
+ uwinapi \
+))
+
+$(eval $(call gb_Library_add_cxxobjects,fps,\
+ fpicker/source/win32/filepicker/FileOpenDlg \
+ fpicker/source/win32/filepicker/FPentry \
+ fpicker/source/win32/filepicker/FilePicker \
+ fpicker/source/win32/filepicker/WinFileOpenImpl \
+ fpicker/source/win32/filepicker/FilterContainer \
+ fpicker/source/win32/filepicker/controlaccess \
+ fpicker/source/win32/filepicker/dibpreview \
+ fpicker/source/win32/filepicker/helppopupwindow \
+ fpicker/source/win32/filepicker/controlcommand \
+ fpicker/source/win32/filepicker/filepickerstate \
+ fpicker/source/win32/filepicker/getfilenamewrapper \
+ fpicker/source/win32/filepicker/asynceventnotifier \
+ fpicker/source/win32/filepicker/previewadapter \
+ fpicker/source/win32/filepicker/previewbase \
+ fpicker/source/win32/filepicker/filepickereventnotification \
+ fpicker/source/win32/filepicker/customcontrol \
+ fpicker/source/win32/filepicker/customcontrolcontainer \
+ fpicker/source/win32/filepicker/customcontrolfactory \
+ fpicker/source/win32/filepicker/dialogcustomcontrols \
+ fpicker/source/win32/filepicker/asyncrequests \
+ fpicker/source/win32/filepicker/VistaFilePickerEventHandler \
+ fpicker/source/win32/filepicker/VistaFilePickerImpl \
+ fpicker/source/win32/filepicker/VistaFilePicker \
+ fpicker/source/win32/filepicker/SolarMutex \
+ , -D_UNICODE -DUNICODE -U_WIN32_WINNT -D_WIN32_WINNT=0x0600
$(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cxxobjects,fps,\
+ fpicker/source/win32/misc/WinImplHelper \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ , -fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE
$(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,fps,\
+ fpicker/source/win32/misc/WinImplHelper \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ , -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+fi
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/fpicker/Library_fps_aqua.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps_aqua.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps_aqua.mk (added)
+++ openoffice/trunk/main/fpicker/Library_fps_aqua.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,62 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps_aqua))
+
+$(eval $(call
gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
+
+$(eval $(call gb_Library_set_include,fps_aqua,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fps_aqua,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_aqua,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_aqua,\
+ fpicker/source/aqua/resourceprovider \
+ fpicker/source/aqua/FPentry \
+ fpicker/source/aqua/SalAquaPicker \
+ fpicker/source/aqua/SalAquaFilePicker \
+ fpicker/source/aqua/SalAquaFolderPicker \
+ fpicker/source/aqua/CFStringUtilities \
+ fpicker/source/aqua/FilterHelper \
+ fpicker/source/aqua/ControlHelper \
+ fpicker/source/aqua/NSString_OOoAdditions \
+ fpicker/source/aqua/NSURL_OOoAdditions \
+ fpicker/source/aqua/AquaFilePickerDelegate \
+))
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/fpicker/Library_fps_gnome.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps_gnome.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps_gnome.mk (added)
+++ openoffice/trunk/main/fpicker/Library_fps_gnome.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,65 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps_gnome))
+
+$(eval $(call
gb_Library_set_componentfile,fps_gnome,fpicker/source/unx/gnome/fps_gnome))
+
+$(eval $(call gb_Library_set_include,fps_gnome,\
+ $$(INCLUDE) \
+ $(filter -I%,$(GTK_CFLAGS)) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_cflags,gps_gnome,\
+ $(filter-out -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_api,fps_gnome,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_gnome,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,fps_gnome,\
+ $(GTK_LIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_gnome,\
+ fpicker/source/unx/gnome/SalGtkPicker \
+ fpicker/source/unx/gnome/SalGtkFilePicker \
+ fpicker/source/unx/gnome/SalGtkFolderPicker \
+ fpicker/source/unx/gnome/resourceprovider \
+ fpicker/source/unx/gnome/FPentry \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/fpicker/Library_fps_kde4.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps_kde4.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps_kde4.mk (added)
+++ openoffice/trunk/main/fpicker/Library_fps_kde4.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,71 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps_kde4))
+
+$(eval $(call
gb_Library_set_componentfile,fps_kde4,fpicker/source/unx/kde4/fps_kde4))
+
+$(eval $(call gb_Library_set_include,fps_kde4,\
+ $$(INCLUDE) \
+ $(filter -I%,$(KDE4_CFLAGS)) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_cflags,fps_kde4,\
+ $(filter-out -I%,$(KDE4_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_api,fps_kde4,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_kde4,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,fps_kde4,\
+ $(KDE4_LIBS) \
+ -lkio \
+ -lkfile \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_kde4,\
+ fpicker/source/unx/kde4/KDE4FilePicker \
+ fpicker/source/unx/kde4/KDE4FPEntry \
+))
+
+$(WORKDIR)/CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc.cxx :
fpicker/source/unx/kde4/KDE4FilePicker.hxx
+ mkdir -p $(dir $@) && \
+ $(MOC4) $< -o $@
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,fps_kde4,\
+ CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc.cxx \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/fpicker/Library_fps_office.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps_office.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps_office.mk (added)
+++ openoffice/trunk/main/fpicker/Library_fps_office.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,67 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps_office))
+
+$(eval $(call
gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office))
+
+$(eval $(call gb_Library_set_include,fps_office,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fps_office,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_office,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ ootk \
+ sal \
+ svl \
+ svt \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,fps_office,\
+ fpicker/source/office/asyncfilepicker \
+ fpicker/source/office/commonpicker \
+ fpicker/source/office/OfficeControlAccess \
+ fpicker/source/office/OfficeFilePicker \
+ fpicker/source/office/OfficeFolderPicker \
+ fpicker/source/office/fpinteraction \
+ fpicker/source/office/fpsmartcontent \
+ fpicker/source/office/fps_office \
+ fpicker/source/office/iodlg \
+ fpicker/source/office/iodlgimp \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/fpicker/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Makefile?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Makefile (added)
+++ openoffice/trunk/main/fpicker/Makefile Thu Dec 22 03:13:55 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: openoffice/trunk/main/fpicker/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/fpicker/Module_fpicker.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Module_fpicker.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Module_fpicker.mk (added)
+++ openoffice/trunk/main/fpicker/Module_fpicker.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,61 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,fpicker))
+
+$(eval $(call gb_Module_add_targets,fpicker,\
+ AllLangResTarget_fps_office \
+ Library_fpicker \
+ Library_fps_office \
+ Package_xml \
+))
+
+ifeq ($(ENABLE_GTK),TRUE)
+GTK_TWO_FOUR:=$(shell pkg-config --exists 'gtk+-2.0 >= 2.4.0' && echo ok)
+ifeq ($(GTK_TWO_FOUR),ok)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps_gnome \
+))
+else
+ $(shell pkg-config --print-errors --exists 'gtk+-2.0 >= 2.4.0')
+endif
+endif
+
+ifeq ($(GUIBASE),unx)
+ifeq ($(ENABLE_KDE4),TRUE)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps_kde4 \
+))
+endif
+endif
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps \
+ Library_fop \
+ WinResTarget_vcl \
+))
+$(eval
+endif
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/fpicker/Package_xml.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Package_xml.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/Package_xml.mk (added)
+++ openoffice/trunk/main/fpicker/Package_xml.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,30 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,fpicker_xml,$(SRCDIR)/fpicker/source))
+
+$(eval $(call
gb_Package_add_file,fpicker_xml,xml/fps_aqua.xml,aqua/fps_aqua.xml))
+$(eval $(call
gb_Package_add_file,fpicker_xml,xml/fps_gnome.xml,unx/gnome/fps_gnome.xml))
+$(eval $(call
gb_Package_add_file,fpicker_xml,xml/fps_kde4.xml,unx/kde4/fps_kde4.xml))
+$(eval $(call
gb_Package_add_file,fpicker_xml,xml/fps.xml,win32/filepicker/fps.xml))
+$(eval $(call
gb_Package_add_file,fpicker_xml,xml/fop.xml,win32/folderpicker/fop.xml))
Added: openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk (added)
+++ openoffice/trunk/main/fpicker/WinResTarget_fpicker.mk Thu Dec 22 03:13:55
2016
@@ -0,0 +1,33 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_WinResTarget_WinResTarget,fpicker/src))
+
+$(eval $(call gb_WinResTarget_set_include,fpicker/src,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc \
+))
+
+$(eval $(call gb_WinResTarget_add_file,fpicker/src,\
+ fpicker/source/win32/filepicker/Fps \
+))
Modified: openoffice/trunk/main/fpicker/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/prj/build.lst?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/prj/build.lst (original)
+++ openoffice/trunk/main/fpicker/prj/build.lst Thu Dec 22 03:13:55 2016
@@ -1,11 +1,2 @@
fp fpicker : LIBXSLT:libxslt L10N:l10n rdbmaker svtools NULL
-fp fpicker\inc nmake
- all fp_inc NULL
-fp fpicker\source\generic nmake - all
fp_generic fp_inc NULL
-fp fpicker\source\office nmake - all
fp_office fp_inc NULL
-fp fpicker\source\unx\gnome nmake - u
fp_gnome_filepicker fp_inc NULL
-fp fpicker\source\unx\kde4 nmake - u
fp_kde4_filepicker fp_inc NULL
-fp fpicker\source\aqua nmake -
u fp_macosx_filepicker NULL
-fp fpicker\source\win32\filepicker nmake - w
fp_win32_filepicker fp_inc NULL
-fp fpicker\source\win32\folderpicker nmake - w
fp_win32_folderpicker fp_inc NULL
-fp fpicker\source\win32\misc nmake - w
fp_win32_misc fp_win32_filepicker.w fp_win32_folderpicker.w fp_inc NULL
-fp fpicker\util nmake - all fp_util
fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
+fp fpicker\prj nmake
- all fp_prj NULL
Modified: openoffice/trunk/main/fpicker/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/prj/d.lst?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/prj/d.lst (original)
+++ openoffice/trunk/main/fpicker/prj/d.lst Thu Dec 22 03:13:55 2016
@@ -1,18 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-
-..\%__SRC%\bin\f*.res %_DEST%\bin%_EXT%\
-..\%__SRC%\bin\f*.dll %_DEST%\bin%_EXT%\
-..\%__SRC%\lib\f*.so %_DEST%\lib%_EXT%\
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\misc\fop.component %_DEST%\xml%_EXT%\fop.component
-..\%__SRC%\misc\fpicker.component %_DEST%\xml%_EXT%\fpicker.component
-..\%__SRC%\misc\fps.component %_DEST%\xml%_EXT%\fps.component
-..\%__SRC%\misc\fps_aqua.component %_DEST%\xml%_EXT%\fps_aqua.component
-..\%__SRC%\misc\fps_gnome.component %_DEST%\xml%_EXT%\fps_gnome.component
-..\%__SRC%\misc\fps_kde4.component %_DEST%\xml%_EXT%\fps_kde4.component
-..\%__SRC%\misc\fps_office.component %_DEST%\xml%_EXT%\fps_office.component
Added: openoffice/trunk/main/fpicker/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/prj/makefile.mk?rev=1775570&view=auto
==============================================================================
--- openoffice/trunk/main/fpicker/prj/makefile.mk (added)
+++ openoffice/trunk/main/fpicker/prj/makefile.mk Thu Dec 22 03:13:55 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
$(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/fpicker/source/aqua/FPentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/aqua/FPentry.cxx?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/aqua/FPentry.cxx (original)
+++ openoffice/trunk/main/fpicker/source/aqua/FPentry.cxx Thu Dec 22 03:13:55
2016
@@ -81,7 +81,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -91,7 +91,7 @@ void SAL_CALL component_getImplementatio
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface*
/*pRegistryKey*/ )
{
void* pRet = 0;
Modified: openoffice/trunk/main/fpicker/source/unx/gnome/FPentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/unx/gnome/FPentry.cxx?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/unx/gnome/FPentry.cxx (original)
+++ openoffice/trunk/main/fpicker/source/unx/gnome/FPentry.cxx Thu Dec 22
03:13:55 2016
@@ -85,7 +85,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -95,7 +95,7 @@ void SAL_CALL component_getImplementatio
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface*
/*pRegistryKey*/ )
{
void* pRet = 0;
Modified: openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FPEntry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FPEntry.cxx?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FPEntry.cxx (original)
+++ openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FPEntry.cxx Thu Dec 22
03:13:55 2016
@@ -46,12 +46,12 @@ static Reference< XInterface > SAL_CALL
// the three uno functions that will be exported
extern "C"
{
- void SAL_CALL component_getImplementationEnvironment( const sal_Char **
ppEnvTypeName, uno_Environment ** )
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName,
uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- void* SAL_CALL component_getFactory( const sal_Char* pImplName,
uno_Interface* pSrvManager, uno_Interface* )
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const
sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
Modified: openoffice/trunk/main/fpicker/source/win32/filepicker/FPentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/win32/filepicker/FPentry.cxx?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/win32/filepicker/FPentry.cxx (original)
+++ openoffice/trunk/main/fpicker/source/win32/filepicker/FPentry.cxx Thu Dec
22 03:13:55 2016
@@ -90,7 +90,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -100,7 +100,7 @@ void SAL_CALL component_getImplementatio
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
Modified: openoffice/trunk/main/fpicker/source/win32/folderpicker/Fopentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/win32/folderpicker/Fopentry.cxx?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/win32/folderpicker/Fopentry.cxx
(original)
+++ openoffice/trunk/main/fpicker/source/win32/folderpicker/Fopentry.cxx Thu
Dec 22 03:13:55 2016
@@ -77,7 +77,7 @@ extern "C"
// component_getImplementationEnvironment
//----------------------------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -88,7 +88,7 @@ void SAL_CALL component_getImplementatio
// returns a factory to create XFilePicker-Services
//----------------------------------------------------------------------
-void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface*
pSrvManager, uno_Interface* )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char*
pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1775570&r1=1775569&r2=1775570&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Thu Dec 22
03:13:55 2016
@@ -77,6 +77,8 @@ my_components = \
component/eventattacher/source/evtatt \
component/fileaccess/util/fileacc \
component/formula/util/for \
+ component/fpicker/source/generic/fpicker \
+ component/fpicker/source/office/fps_office \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@ -137,8 +139,6 @@ my_components = \
filterconfig1 \
flash \
flat \
- fpicker \
- fps_office \
frm \
guesslang \
i18npool \
@@ -317,7 +317,7 @@ my_components += \
my_components += \
component/avmedia/source/macavf/avmediaMacAVF \
component/avmedia/source/quicktime/avmediaQuickTime \
- fps_aqua \
+ components/fpicker/source/aqua/fps_aqua \
macab1 \
macbe1 \
MacOSXSpell
@@ -331,8 +331,8 @@ my_components += \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
component/dtrans/util/sysdtrans \
- fop \
- fps \
+ component/fpicker/source/win32/folderpicker/fop \
+ component/fpicker/source/win32/filepicker/fps \
java_uno_accessbridge \
sysmail \
winaccessibility \
@@ -371,11 +371,11 @@ my_components += desktopbe1
.END
.IF "$(GTK_TWO_FOUR)" != ""
-my_components += fps_gnome
+my_components += component/fpicker/source/unx/gnome/fps_gnome
.END
.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != ""
-my_components += fps_kde4
+my_components += component/fpicker/source/unx/kde4/fps_kde4
.END
.IF "$(OS)" != "WNT"
