diff options
author | Memphiz <memphis@machzwo.de> | 2015-07-28 11:38:00 +0200 |
---|---|---|
committer | Memphiz <memphis@machzwo.de> | 2015-07-28 19:12:05 +0200 |
commit | ebcb3abd3c481f6f6c9f71b357fdc48da8089f65 (patch) | |
tree | 1efc84298d1f34928bc9e5ff7ccf865d5d3a1bc3 | |
parent | 342ecde0a311fc2d6c30000873cf55ebeffa5ccc (diff) |
[buildsys/Make] - remove main.a from the list of DIRECTORY_ARCHIVES for preventing duplicate linkage when compiling unit tests
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | xbmc/main/posix/Makefile.in | 7 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 1a0fea970d..1f840bdc74 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56,7 +56,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ xbmc/interfaces/python/python_binding.a \ xbmc/linux/linux.a \ xbmc/listproviders/listproviders.a \ - xbmc/main/main.a \ + xbmc/main/posix/MessagePrinter.a \ xbmc/media/media.a \ xbmc/messaging/messaging.a \ xbmc/music/dialogs/musicdialogs.a \ diff --git a/configure.ac b/configure.ac index d92c395cc0..c50a3643e9 100644 --- a/configure.ac +++ b/configure.ac @@ -2512,6 +2512,7 @@ OUTPUT_FILES="Makefile \ xbmc/android/jni/Makefile \ xbmc/utils/Makefile \ xbmc/main/Makefile \ + xbmc/main/posix/Makefile \ tools/darwin/Configurations/App.xcconfig \ tools/darwin/Configurations/Common.xcconfig \ tools/darwin/packaging/ios/mkdeb-ios.sh \ diff --git a/xbmc/main/posix/Makefile.in b/xbmc/main/posix/Makefile.in new file mode 100644 index 0000000000..1bbb986831 --- /dev/null +++ b/xbmc/main/posix/Makefile.in @@ -0,0 +1,7 @@ +.SUFFIXES : .cpp + +SRCS = MessagePrinter.cpp +LIB=MessagePrinter.a + +include @abs_top_srcdir@/Makefile.include +-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS))) |