Commit Graph

168 Commits

Author SHA1 Message Date
Sijia Chen
9d25161f40 add version updates after 1.5 release 2015-10-15 09:54:10 -07:00
fstd
f383137fe1 Consolidate BSD build to support NetBSD and OpenBSD as well 2015-09-15 18:06:16 +02:00
Martin Storsjö
4c8347aa22 Don't concatenate $@ to AR_OPTS
The MSVC version of AR_OPTS already contains $@, in a very specific
way.

This fixes MSVC builds after c8bed8a9.
2015-06-26 14:09:00 +03:00
deadNightTiger
c8bed8a9bd Move -D flag for ar to platform-linux.mk 2015-06-25 14:25:28 +04:00
deadNightTiger
3a131800a8 Enable deterministic mode for ar 2015-06-25 13:57:00 +04:00
Bernhard Miklautz
356f081f0a Make the static library directory configurable
When running "make install" the destination of pkgconfig/openh264.pc and
lib/libopenh264.a was hard coded to "lib". When building packages it
might be required to change the install location of those files to
the systems default library location (like lib64 or lib/x86_64-linux-gnu
for example).

This commit adds an additional make variable "LIBDIR_NAME" that allows
it to change the destination directory for those files.
Without setting LIBDIR_NAME the installation location is the same as before
(lib).
2015-06-19 16:23:34 +02:00
Ghislain MARY
93a5597c11 More fixes for out-of-tree build:
- Generate version header in the build tree
 - Generate .res file in the build tree on Windows
 - Add the $(SRC_PATH) prefix to the .def files on Windows
2015-05-29 14:57:07 +02:00
Martin Storsjö
9ed902a8d7 Use vpath instead of explicit $(SRC_PATH) for building .pc files out of tree 2015-05-29 00:10:45 +03:00
Ghislain MARY
1b97daab20 Fix install targets for out-of-tree builds. 2015-05-25 13:02:12 +02:00
Martin Storsjö
9ebab7094f Clean up spacing in the quiet rules in the makefile 2015-04-22 09:23:08 +03:00
Martin Storsjö
f077d51f7e Move the "all" make target before including any platform files
This makes sure that "all" stays as the default make target even if
platform makefiles add extra rules.
2015-04-22 09:20:31 +03:00
Martin Storsjö
75251b5af7 Remove stray spaces before colon in messages 2015-04-22 09:19:59 +03:00
Martin Storsjö
fed2043f8d Group version related makefile variables together 2015-04-22 09:15:57 +03:00
Martin Storsjö
2b33c74993 Include the version number and other info in the built DLL file 2015-04-20 12:08:52 +03:00
Martin Storsjö
aa0fa56cdc Simplify the makefile handling of building the unit test library
Instead of repeating everything hardcoded with platform ifdefs,
use a common define BUILD_UT_EXE to define whether we should build
an executable or a library of the unit test suite. Later factorize
all other platform differences into smaller and simpler ifdefs.
2015-04-17 16:17:35 +03:00
Martin Storsjö
0e99473a46 Reorder ifeq/ifneq for a long if statement
By having the very short clause first, it is easier to see
what it belongs to.
2015-04-17 15:56:56 +03:00
Martin Storsjö
8368f66afe Remove a stray double space 2015-04-17 15:46:15 +03:00
Martin Storsjö
513dfde31c Reduce some nested ifdefs in the makefile 2015-04-17 15:38:06 +03:00
Martin Storsjö
4f8c4f5925 Don't try to run the unit test suite on "make test" for windows phone
This makes it consistent with android and iOS.
2015-04-17 15:28:05 +03:00
huade
f092b2a478 add ut demo for wp8 2015-04-17 14:10:12 +08:00
Ethan Hugg
ee4ae13ce3 Use gmp-api branch Firefox39 2015-04-03 09:39:02 -07:00
Martin Storsjö
4780c6a8f8 Remove the extra slash between $(DESTDIR) and $(PREFIX)
If DESTDIR is set, it needs to include a trailing slash now.

This fixes "make install" on msys (i.e. on windows), where a path
starting with // is interpreted as a special network path.
2015-03-16 15:47:32 +02:00
Ethan Hugg
cea83438bf Change gmp-api version to Firefox38 2015-02-28 08:50:23 -08:00
Martin Storsjö
e4a278620b Remove dependencies on the decoder internals in unit test for the common library 2015-02-02 12:44:04 +02:00
sijchen
79b38f55ff Merge pull request #1783 from mstorsjo/simplify-includes
Simplify include paths for unittest sub libraries
2015-02-02 09:30:27 +08:00
Martin Storsjö
8d539600bb Simplify unittest include paths
Move the "test" directory to CODEC_UNITTEST_INCLUDES instead of
duplicating it in every definition.
2015-02-02 00:51:02 +02:00
Martin Storsjö
84b3216d7c Remove redundant unittest include paths
The local directory doesn't need to be added to the include path.
2015-02-02 00:50:54 +02:00
Martin Storsjö
078d96bef7 Don't overwrite the git-tracked version.h
When generating a new version of the header, that includes the
actual git hash, don't overwrite the file that is tracked by git.
Instead create a new file, and include this only if the build system
indicates that it exists (by setting a define). This allows the
untouched source tree to be built from within an IDE even if make
has not been run.

This reduces the hassle with a file that needs to be ignored in the
git configuration.

The downside is that the generated file isn't used if building
from within an IDE, if the header has been updated by calling make
before (since the IDE configuration doesn't know whether the user
actually has run make). Since users of the IDE might not build via
make in the command line at all (in the same source checkout at least),
this should not be an issue in practice. The previous way things worked,
the version hash (generated by make) when used in an IDE could actually
be outdated and misleading.
2015-01-30 10:55:16 +02:00
Sijia Chen
a4f09f4d76 update the version info to sync with recent change of API 2015-01-29 11:14:08 +08:00
Martin Storsjö
b444f8d9d0 Remove more generated files in "make clean"
Make sure to remove *.exe also, if cross-building from unix to
windows (and running "make clean" without specifying mingw as
target OS).
2015-01-28 09:39:55 +02:00
sijchen
eb7b149fcc Merge pull request #1736 from mstorsjo/werror-tests
Build using -Werror in travis unit tests
2015-01-19 10:54:11 +08:00
Martin Storsjö
3cf2be2590 Don't override the externally set CFLAGS variable in debug mode
This is similar to how it is done in release mode already.

The fact that this behaviour differed between release and debug
can be traced back to commit cf92e8d6.
2015-01-16 14:02:01 +02:00
Martin Storsjö
1646f86b37 Allow setting cflags specifically for the unit test suite 2015-01-16 13:38:06 +02:00
Martin Storsjö
fb33b359d5 Add $(DESTDIR) for the install-static rule as well
The change for adding these were merged after the commit for
adding $(DESTDIR) was done.
2015-01-07 20:24:09 +02:00
Luca Barbato
735172d387 build: Support DESTDIR
Distribution rely on that to properly package software.
2015-01-07 10:44:35 +01:00
Martin Storsjö
1a995cc991 Include private dependencies in the Libs line in pkg-config if only installing a static library
If only a static library is installed, the user of the library may
not know that only a static version of this particular library is
available (and doesn't know that --static should be added to the
pkg-config call). Therefore, one common practice is to include private
dependencies in the public Libs line if a static-only library is
installed.
2015-01-02 22:07:29 +02:00
Martin Storsjö
93621d6d9a Include -lstdc++ under Libs.private in the pkg-config file
This allows linking statically to the library, by passing --static
to pkg-config.
2015-01-02 21:54:21 +02:00
Martin Storsjö
a24bac34bd Don't install the pkg-config file as readonly
This file should be installed just as any other file, protected by
normal user permissions, not by making the file readonly.
2015-01-02 21:52:36 +02:00
Martin Storsjö
3901045318 Simplify the makefile rule for generating the pkg-config file 2015-01-02 21:52:05 +02:00
Zaheer Abbas Merali
09f6eeb940 Update version in Makefile. 2014-12-22 13:05:08 +00:00
Ethan Hugg
a8159c89d1 Switch to use stable branch of gmp-api 2014-12-04 10:24:36 -08:00
Martin Storsjö
3d263d1087 Set a default SHAREDLIB_DIR in the main Makefile
Only override it in the ones where the default isn't desired.
2014-12-01 15:44:27 +02:00
Martin Storsjö
9b59e50292 Simplify creating output directories for the install-shared rule 2014-12-01 15:44:27 +02:00
Martin Storsjö
a48b632aed Actually install the shared library into $(SHAREDLIB_DIR) as intended 2014-12-01 15:44:27 +02:00
Martin Storsjö
59c30f8952 Handle generating the versionless library via make rules
This makes sure both "make libopenh264.so" and "make libopenh264.so.0"
work as intended.

Use the versionless name as dependency for the install rule,
to make sure both (if possible) are created.
2014-12-01 15:43:35 +02:00
Martin Storsjö
575b6fb570 Check the suffix instead of checking whether a file is a link
This feels more straightforward - some file systems/environments
(such as MSys) implement symlinks as plain file copies, where
distinguishing whether a file is a link might be hard.
2014-12-01 15:40:25 +02:00
Martin Storsjö
2c9b5b98c0 Actually install the versioned shared library file as well 2014-12-01 15:40:25 +02:00
Martin Storsjö
80beaed5c6 Fix the dependencies of the install-shared target
Previously calling "make install" failed unless the target
actually already was built, for platforms where the shared
libraries are versioned.
2014-12-01 15:40:25 +02:00
Martin Storsjö
8f7e10ab12 Honor the silent build flag when adding the shared library symlink 2014-12-01 15:40:25 +02:00
Martin Storsjö
397e20b0f3 Install the import library via the EXTRA_LIB mechanism on mingw as well
Prior to 3f69873c99, there already was a mechanism for installing
the import library, used for the MSVC builds. Use that for mingw
as well, instead of adding more hardcoded rules.
2014-12-01 15:40:25 +02:00