summaryrefslogtreecommitdiff
path: root/lib/et
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2005-01-26 12:59:25 -0500
committerTheodore Ts'o <tytso@mit.edu>2005-01-26 12:59:25 -0500
commite644186542707a44e5fbeddd581eb3f77a30ba0f (patch)
treedddd52be633549dbf97266862ca3d2845ed57d51 /lib/et
parent79fc2a99ace9e7a9cdce7227320165f7fb57c591 (diff)
downloade2fsprogs-e644186542707a44e5fbeddd581eb3f77a30ba0f.tar.gz
Add pkg-config files to e2fsprogs's libraries.
Diffstat (limited to 'lib/et')
-rw-r--r--lib/et/ChangeLog4
-rw-r--r--lib/et/Makefile.in15
-rw-r--r--lib/et/com_err.pc.in11
3 files changed, 26 insertions, 4 deletions
diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index aa393c5c..5835d3f0 100644
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-26 Theodore Ts'o <tytso@mit.edu>
+
+ * com_err.pc.in: Add pkg-config files.
+
2004-12-14 Theodore Ts'o <tytso@mit.edu>
* Makefile.in: Use Linux-kernel-style makefile output for "make
diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 6f27cb8c..51acd373 100644
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -13,7 +13,7 @@ DEP_MAKEFILE = $(DEP_LIB_MAKEFILES)
@MCONFIG@
-all:: compile_et
+all:: compile_et com_err.pc
OBJS= error_message.o et_name.o init_et.o com_err.o com_right.o
SRCS = $(srcdir)/error_message.c $(srcdir)/et_name.c $(srcdir)/init_et.c \
@@ -62,6 +62,10 @@ compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in
com_err.ps : com_err.dvi
com_err.dvi: com_err.texinfo
+com_err.pc: $(srcdir)/com_err.pc.in $(top_builddir)/config.status
+ @echo " CONFIG.STATUS $@"
+ @cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
+
#libcom_err.o: $(LIBOBJS)
# $(LD) -r -s -o libcom_err.o $(LIBOBJS)
# chmod -x libcom_err.o
@@ -74,9 +78,9 @@ installdirs::
@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
- $(DESTDIR)$(man3dir)
+ $(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
-install:: compile_et libcom_err.a $(HFILES) installdirs
+install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc
@echo " INSTALL_DATA $(libdir)/libcom_err.a"
@$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
@-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
@@ -96,10 +100,13 @@ install:: compile_et libcom_err.a $(HFILES) installdirs
@echo " INSTALL_DATA $(man1dir)/compile_et.1"
@$(INSTALL_DATA) $(srcdir)/compile_et.1 \
$(DESTDIR)$(man1dir)/compile_et.1
+ @echo " INSTALL_DATA $(libdir)/pkgconfig/com_err.pc"
+ @$(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libcom_err.a \
- $(DESTDIR)$(bindir)/compile_et
+ $(DESTDIR)$(bindir)/compile_et \
+ $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
$(RM) -rf $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et
check:: compile_et
diff --git a/lib/et/com_err.pc.in b/lib/et/com_err.pc.in
new file mode 100644
index 00000000..c42774a1
--- /dev/null
+++ b/lib/et/com_err.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: com_err
+Description: Common error description library
+Version: @E2FSPROGS_VERSION@
+Requires:
+Cflags: -I${includedir}
+Libs: -L${libdir} -lcom_err