summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 982014b)
raw | patch | inline | side by side (parent: 982014b)
author | Chris Ring <cring@ti.com> | |
Tue, 4 Feb 2014 22:25:35 +0000 (14:25 -0800) | ||
committer | Chris Ring <cring@ti.com> | |
Tue, 4 Feb 2014 22:25:35 +0000 (14:25 -0800) |
Check in autoreconf-generated files after the pkg-config
changes.
changes.
Makefile.in | patch | blob | history | |
configure | patch | blob | history | |
linux/src/api/Makefile.in | patch | blob | history | |
linux/src/utils/Makefile.in | patch | blob | history |
diff --git a/Makefile.in b/Makefile.in
index 3bed46d152ce4a615ad2fb16054213ebd73e514d..8f8b4c6d46813c8d4912239b892e27ff2d23b08c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/linux/build-aux $(distdir)/linux/src/mm $(distdir)/packages/ti/ipc
+ $(mkdir_p) $(distdir)/linux/build-aux $(distdir)/linux/src/api $(distdir)/linux/src/mm $(distdir)/linux/src/utils $(distdir)/packages/ti/ipc
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
diff --git a/configure b/configure
index 89dcde5b253914c6bc9940757ae480f47a66a664..38610a5049ca28f9df3add4bf89bb82ce8165780 100755 (executable)
--- a/configure
+++ b/configure
ac_config_files="$ac_config_files linux/src/utils/Makefile"
+ ac_config_files="$ac_config_files linux/src/utils/libtiipcutils.pc"
+
ac_config_files="$ac_config_files linux/src/api/Makefile"
+ ac_config_files="$ac_config_files linux/src/api/libtiipc.pc"
+
ac_config_files="$ac_config_files linux/src/mm/Makefile"
ac_config_files="$ac_config_files linux/src/mm/libmmrpc.pc"
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"linux/etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/etc/Makefile" ;;
"linux/src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/utils/Makefile" ;;
+ "linux/src/utils/libtiipcutils.pc" ) CONFIG_FILES="$CONFIG_FILES linux/src/utils/libtiipcutils.pc" ;;
"linux/src/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/api/Makefile" ;;
+ "linux/src/api/libtiipc.pc" ) CONFIG_FILES="$CONFIG_FILES linux/src/api/libtiipc.pc" ;;
"linux/src/mm/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/mm/Makefile" ;;
"linux/src/mm/libmmrpc.pc" ) CONFIG_FILES="$CONFIG_FILES linux/src/mm/libmmrpc.pc" ;;
"linux/src/daemon/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/src/daemon/Makefile" ;;
index a61469a8a264cbf6c8f3e57da0aabeb3908cf374..930634cfe6e85954d397b673a99996b2563a12f4 100644 (file)
@SET_MAKE@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
subdir = linux/src/api
DIST_COMMON = $(libtiipc_la_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in $(srcdir)/libtiipc.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = libtiipc.pc
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libtiipc_ladir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(libtiipc_ladir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libtiipc_la_LIBADD =
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libtiipc_la_SOURCES)
DIST_SOURCES = $(am__libtiipc_la_SOURCES_DIST)
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgconfig_DATA)
libtiipc_laHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(libtiipc_la_HEADERS)
ETAGS = etags
# Add version info to the shared library
libtiipc_la_LDFLAGS = -version-info 1:0:0
+pkgconfig_DATA = libtiipc.pc
+pkgconfigdir = $(libdir)/pkgconfig
all: all-am
.SUFFIXES:
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+libtiipc.pc: $(top_builddir)/config.status $(srcdir)/libtiipc.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ done
+
+uninstall-pkgconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ done
install-libtiipc_laHEADERS: $(libtiipc_la_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libtiipc_ladir)" || $(mkdir_p) "$(DESTDIR)$(libtiipc_ladir)"
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libtiipc_ladir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libtiipc_ladir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
info-am:
-install-data-am: install-libtiipc_laHEADERS
+install-data-am: install-libtiipc_laHEADERS install-pkgconfigDATA
install-exec-am: install-libLTLIBRARIES
ps-am:
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-libtiipc_laHEADERS
+ uninstall-libtiipc_laHEADERS uninstall-pkgconfigDATA
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool ctags distclean \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am \
install-libLTLIBRARIES install-libtiipc_laHEADERS install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-libtiipc_laHEADERS
+ install-pkgconfigDATA install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-libtiipc_laHEADERS \
+ uninstall-pkgconfigDATA
###############################################################################
index 876d33e8ea00c28b72c8a510d364c6e1cfb14623..a3d673cdad325c4c98aa08b521b670df7ddcf2bf 100644 (file)
@SET_MAKE@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
subdir = linux/src/utils
DIST_COMMON = $(libtiipcutils_la_HEADERS) \
$(libtiipcutils_lad_la_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in $(srcdir)/libtiipcutils.pc.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = libtiipcutils.pc
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" \
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(libtiipcutils_ladir)" \
"$(DESTDIR)$(libtiipcutils_lad_ladir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
SOURCES = $(libtiipcutils_la_SOURCES) $(libtiipcutils_lad_la_SOURCES)
DIST_SOURCES = $(libtiipcutils_la_SOURCES) \
$(libtiipcutils_lad_la_SOURCES)
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgconfig_DATA)
libtiipcutils_laHEADERS_INSTALL = $(INSTALL_HEADER)
libtiipcutils_lad_laHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(libtiipcutils_la_HEADERS) $(libtiipcutils_lad_la_HEADERS)
# Add version info to the shared library
libtiipcutils_la_LDFLAGS = -version-info 1:0:0
libtiipcutils_lad_la_LDFLAGS = -version-info 1:0:0
+pkgconfig_DATA = libtiipcutils.pc
+pkgconfigdir = $(libdir)/pkgconfig
all: all-am
.SUFFIXES:
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+libtiipcutils.pc: $(top_builddir)/config.status $(srcdir)/libtiipcutils.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ done
+
+uninstall-pkgconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ done
install-libtiipcutils_laHEADERS: $(libtiipcutils_la_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libtiipcutils_ladir)" || $(mkdir_p) "$(DESTDIR)$(libtiipcutils_ladir)"
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libtiipcutils_ladir)" "$(DESTDIR)$(libtiipcutils_lad_ladir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libtiipcutils_ladir)" "$(DESTDIR)$(libtiipcutils_lad_ladir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
info-am:
install-data-am: install-libtiipcutils_laHEADERS \
- install-libtiipcutils_lad_laHEADERS
+ install-libtiipcutils_lad_laHEADERS install-pkgconfigDATA
install-exec-am: install-libLTLIBRARIES
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
uninstall-libtiipcutils_laHEADERS \
- uninstall-libtiipcutils_lad_laHEADERS
+ uninstall-libtiipcutils_lad_laHEADERS uninstall-pkgconfigDATA
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool ctags distclean \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am \
install-libLTLIBRARIES install-libtiipcutils_laHEADERS \
- install-libtiipcutils_lad_laHEADERS install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-libtiipcutils_lad_laHEADERS install-man \
+ install-pkgconfigDATA install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am \
uninstall-libLTLIBRARIES uninstall-libtiipcutils_laHEADERS \
- uninstall-libtiipcutils_lad_laHEADERS
+ uninstall-libtiipcutils_lad_laHEADERS uninstall-pkgconfigDATA
###############################################################################