diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-12-01 01:30:32 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-12-01 01:30:32 +0100 |
| commit | 2c83d31ceec4b7014783a8c207b66b8f5ae0c318 (patch) | |
| tree | 9c7b033241c64dcc54e1a6cc51f13d32d5599b3c | |
| parent | fb41a54877f82982b88a89aecd473f1089cc5252 (diff) | |
| download | enigma2-2c83d31ceec4b7014783a8c207b66b8f5ae0c318.tar.gz enigma2-2c83d31ceec4b7014783a8c207b66b8f5ae0c318.zip | |
update and install enigma2.pc
| -rwxr-xr-x | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | enigma2.pc.in | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index ab2d1639..ff252e60 100755 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,9 @@ install_PYTHON = \ keyids.py keymapparser.py mytest.py skin.py timer.py tools.py GlobalActions.py \ e2reactor.py +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = enigma2.pc + metadir = $(datadir)/meta meta_DATA = index-enigma2.xml CLEANFILES = index-enigma2.xml diff --git a/configure.ac b/configure.ac index 6e77e497..0c54f5bf 100644 --- a/configure.ac +++ b/configure.ac @@ -92,8 +92,12 @@ if test "$with_po" = "yes"; then fi AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes") +ENIGMA2_CFLAGS="-fno-rtti -fno-exceptions" +AC_SUBST(ENIGMA2_CFLAGS) + CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" -CXXFLAGS="$CXXFLAGS $BASE_CFLAGS $PTHREAD_CFLAGS $DEBUG_CFLAGS -fno-rtti -fno-exceptions -Wall" +CFLAGS="$CFLAGS $DEBUG_CFLAGS -Wall" +CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS -Wall $BASE_CFLAGS $ENIGMA2_CFLAGS $PTHREAD_CFLAGS" AC_CONFIG_FILES([ Makefile diff --git a/enigma2.pc.in b/enigma2.pc.in index 01ba4341..f34d904d 100644 --- a/enigma2.pc.in +++ b/enigma2.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: enigma2 Description: Enigma2 Version: @VERSION@ -Libs: -Cflags: -I${includedir}/enigma2 +Cflags: -I${includedir}/enigma2 @ENIGMA2_CFLAGS@ +Requires.private: sigc++-1.2 |