* fix clean and dist rules

* create eina-$(maj_version).pc.in file automatically


SVN revision: 36292

legacy/eina/Makefile.am

@@ -4,34 +4,32 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src doc
 
+DISTCLEANFILES = \
+eina-@VMAJ@.pc.in
+
 MAINTAINERCLEANFILES = \
 Makefile.in \
 aclocal.m4 \
 config.guess \
 config.h.in \
+config.h.in~ \
 config.sub \
 configure \
+depcomp \
 install-sh \
 ltconfig \
 ltmain.sh \
-missing mkinstalldirs \
-stamp-h.in \
-build-stamp \
-configure-stamp \
-depcomp \
-eina.pc \
-eina_docs.tar.gz
+missing
 
 EXTRA_DIST = \
 AUTHORS \
 COPYING \
-gendoc \
-Doxyfile \
+OLD-COPYING.PLAIN \
 README \
-eina.pc
+eina-@VMAJ@.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = eina.pc
+pkgconfig_DATA = eina-@VMAJ@.pc
 
 .PHONY: doc coverage benchmark
 
@@ -76,9 +74,6 @@ coverage:
 	@make lcov-reset
 	@make check
 	@make lcov-report
-
-clean-local:
-	@rm -rf coverage benchmark
 else
 lcov-reset:
 	@echo "reconfigure with --enable-coverage"
@@ -102,3 +97,6 @@ else
 benchmark:
 	@echo "reconfigure with --enable-bench"
 endif
+
+clean-local:
+	@rm -rf coverage benchmark

legacy/eina/configure.in

@@ -285,7 +285,6 @@ case "${host_os}" in
       EINA_CFLAGS="${EINA_CFLAGS} ${EVIL_CFLAGS}"
    ;;
 esac
-AC_SUBST(EINA_CFLAGS)
 
 if test "x$enable_coverage" = "xyes" ; then
    EINA_CFLAGS="${EINA_CFLAGS} ${DEBUG_CFLAGS}"
@@ -295,6 +294,8 @@ if ! test "${VMIC}" = "x" ; then
    EINA_CFLAGS="${EINA_CFLAGS} -Wall -W -Wextra" # -Werror
 fi
 
+AC_SUBST(EINA_CFLAGS)
+
 
 ### Checks for linker characteristics
 EINA_LIBS=""
@@ -317,11 +318,28 @@ AC_SUBST(lt_enable_auto_import)
 AC_FUNC_ALLOCA
 
 
+### Create the .pc.in file according to the major version
+cat > eina-${VMAJ}.pc.in << EOF
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Eina
+Description: A Library that implements fast data types and miscellaneous tools
+Requires:
+Version: @VERSION@
+Libs: -L${libdir} -leina
+Libs.private: -ldl
+Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina
+EOF
+
+
 ### Make the debug preprocessor configurable
 
 AC_CONFIG_FILES([
 Makefile
-eina.pc
+eina-${VMAJ}.pc
 doc/Makefile
 src/Makefile
 src/include/Makefile

legacy/eina/doc/Makefile.am

@@ -1,6 +1,5 @@
 
-MAINTAINERCLEANFILES = \
-Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
 
 .PHONY: doc
 
@@ -19,3 +18,5 @@ endif
 
 clean-local:
 	@rm -rf html/ latex/ man/
+
+EXTRA_DIST = Doxyfile

legacy/eina/src/include/Makefile.am

@@ -27,10 +27,14 @@ eina_inline_rbtree.x \
 eina_inline_mempool.x \
 eina_iterator.h
 
-EXTRA_DIST = eina_config.h.in
-
 installed_mainheaderdir = $(prefix)/include/eina-@VMAJ@
 installed_mainheader_DATA = Eina.h eina_config.h
 
 installed_headersdir = $(prefix)/include/eina-@VMAJ@/eina
 installed_headers_DATA = $(EINAHEADERS)
+
+EXTRA_DIST = \
+Eina.h \
+eina_config.h.in \
+$(EINAHEADERS) \
+eina_private.h