[pkg-opensc-commit] [libp11] 57/67: Makefile cleanup

Eric Dorland eric at moszumanska.debian.org
Sat Jan 30 05:34:17 UTC 2016


This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit 6ca0f04e279c73d75c5bdd0808b78460268e0cdb
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Tue Jan 19 19:00:03 2016 +0100

    Makefile cleanup
---
 Makefile.am     |  3 +--
 ltrc.inc        | 13 -------------
 src/Makefile.am |  3 +--
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 985d326..bbfda7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 MAINTAINERCLEANFILES = \
 	config.log config.status \
-	$(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \
+	$(srcdir)/configure $(srcdir)/Makefile.in \
 	$(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
 	$(srcdir)/depcomp $(srcdir)/aclocal.m4 \
 	$(srcdir)/config.guess $(srcdir)/config.sub \
diff --git a/ltrc.inc b/ltrc.inc
deleted file mode 100644
index b6bad67..0000000
--- a/ltrc.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required to build Windows resource file
-
-RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS)
-LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
-
-.rc.lo:
-	$(LTRCCOMPILE) -i "$<" -o "$@"
-
-.rc.o:
-	$(RCCOMPILE) -i "$<" -o "$@"
-
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 8935868..fa8e1be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,5 @@
-include $(top_srcdir)/ltrc.inc
-
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+	$(srcdir)/config.h.in $(srcdir)/config.h.in~
 CLEANFILES = libp11.pc
 EXTRA_DIST = Makefile.mak versioninfo.rc.in
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git



More information about the pkg-opensc-commit mailing list