[med-svn] [cnrun] 19/25: WIP (executable builds)

[andrei zavada]

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

hmmr-guest pushed a commit to branch WIP
in repository cnrun.

commit 6301d96acc3004aa0fc00f36823c3b3deef057be
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Wed Oct 1 01:54:01 2014 +0300

    WIP (executable builds)
---
 upstream/src/cnrun/Makefile.am | 10 ++++++++--
 upstream/src/cnrun/main.cc     |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/upstream/src/cnrun/Makefile.am b/upstream/src/cnrun/Makefile.am
index 04bd11b..e08045f 100644
--- a/upstream/src/cnrun/Makefile.am
+++ b/upstream/src/cnrun/Makefile.am
@@ -13,8 +13,8 @@ bin_PROGRAMS := \
 cnrun_SOURCES := \
 	interpreter.cc commands.cc cnrun.hh main.cc print_version.cc
 cnrun_LDADD := \
-	$(top_srcdir)/src/libcn/libcn.la \
-	$(top_srcdir)/src/libstilton/libstilton.la \
+	../libcn/libcn.la \
+	../libstilton/libstilton.la \
 	$(LIBCN_LIBS) \
 	$(LUA_LIB)
 
@@ -24,3 +24,9 @@ FORCE:
 
 cnrun_LDFLAGS := \
 	-shared
+
+install-exec-hook:
+	rm -f $(DESTDIR)/$(pkglibdir)/*.la
+uninstall-hook:
+	rm -f $(DESTDIR)/$(pkglibdir)/*.so
+
diff --git a/upstream/src/cnrun/main.cc b/upstream/src/cnrun/main.cc
index ed02e90..a30c506 100644
--- a/upstream/src/cnrun/main.cc
+++ b/upstream/src/cnrun/main.cc
@@ -83,6 +83,10 @@ parse_opt( int key, char *arg, struct argp_state *state)
 
         char *endp = nullptr;
         switch ( key ) {
+        case opt::list_units:
+                Q.list_units = true;
+                break;
+
         case opt::chdir:
                 Q.working_dir = arg;
                 break;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git