diff options
| -rw-r--r-- | automation/Library_communi.mk.old | 99 | ||||
| -rw-r--r-- | avmedia/Library_avmediagst.mk | 7 |
2 files changed, 5 insertions, 101 deletions
diff --git a/automation/Library_communi.mk.old b/automation/Library_communi.mk.old deleted file mode 100644 index a890e45c5756..000000000000 --- a/automation/Library_communi.mk.old +++ /dev/null @@ -1,99 +0,0 @@ -#************************************************************** -# -# 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,communi)) - -$(eval $(call gb_Library_add_precompiled_header,communi,$(SRCDIR)/automation/inc/pch/precompiled_automation)) - -$(eval $(call gb_Library_add_package_headers,communi,automation_inc)) - -$(eval $(call gb_Library_set_include,communi,\ - $$(INCLUDE) \ - -I$(SRCDIR)/automation/inc \ - -I$(SRCDIR)/automation/inc/pch \ - -I$(SRCDIR)/automation/source/inc \ -)) - -#$(eval $(call gb_Library_add_defs,communi,\ -# -DAVMEDIA_DLLIMPLEMENTATION \ -#)) - -$(eval $(call gb_Library_add_api,communi,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_Library_add_linked_libs,communi,\ - sal \ - simplecm \ - svl \ - tl \ - vcl \ - vos3 \ - $(gb_STDLIBS) \ -)) - -ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,communi,\ - advapi32 \ - gdi32 \ -)) -endif - -$(eval $(call gb_Library_add_noexception_objects,communi,\ - automation/source/communi/communi \ - automation/source/server/recorder \ - automation/source/server/svcommstream \ - automation/source/server/cmdbasestream \ - automation/source/server/scmdstrm \ - automation/source/server/sta_list \ - automation/source/server/editwin \ - automation/source/server/retstrm \ - automation/source/server/profiler \ - automation/source/simplecm/tcpio \ - automation/source/simplecm/packethandler \ - automation/source/simplecm/simplecm \ -)) - -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_add_noexception_objects,communi,\ - automation/source/server/prof_usl \ -)) -else -$(eval $(call gb_Library_add_noexception_objects,communi,\ - automation/source/server/prof_nul \ -)) -endif - -$(eval $(call gb_Library_add_exception_objects,communi,\ - automation/source/server/XMLParser \ - automation/source/server/server \ -)) - -$(eval $(call gb_Library_add_cxxobjects,dnd,\ - automation/source/server/statemnt \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) - - -# vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 7ceecd13747d..b37ef6e6a795 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -62,10 +62,13 @@ $(eval $(call gb_Library_add_libs,avmediagst,\ $(eval $(call gb_Library_add_exception_objects,avmediagst,\ avmedia/source/gstreamer/gstuno \ - avmedia/source/gstreamer/gstmanager \ - avmedia/source/gstreamer/gstwindow \ avmedia/source/gstreamer/gstplayer \ avmedia/source/gstreamer/gstframegrabber \ )) +$(eval $(call gb_Library_add_noexception_objects,avmediagst,\ + avmedia/source/gstreamer/gstmanager \ + avmedia/source/gstreamer/gstwindow \ +)) + # vim: set noet sw=4 ts=4: |