Changeset a223b6b

Timestamp:

Apr 19, 2013, 3:22:54 AM (12 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10

Children:

499224d

Parents:

487cc2b

git-author:

Anders Kaseorg <andersk@mit.edu> (04/09/13 19:40:28)

git-committer:

Anders Kaseorg <andersk@mit.edu> (04/19/13 03:22:54)

Message:

Build bin/{barnowl,tester} instead of {barnowl,tester}.bin

This lets us get rid of some silly install and uninstall hooks.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• Makefile.am (modified) (4 diffs)
• barnowl-wrapper.in (modified) (1 diff)

Makefile.am

@@ -4 +4 @@
 GIT_FLAGS := $(if $(GIT_DESCRIPTION),-DGIT_VERSION=$(GIT_DESCRIPTION:barnowl-%=%))
 
-bin_PROGRAMS = barnowl.bin
+bin_PROGRAMS = bin/barnowl
 if ENABLE_ZCRYPT
 bin_PROGRAMS += zcrypt
@@ -11 +11 @@
 zcrypt_SOURCES = zcrypt.c filterproc.c
 
-check_PROGRAMS = tester.bin
+check_PROGRAMS = bin/tester
 dist_check_DATA = t
 dist_check_SCRIPTS = runtests.sh
 
-bin_SCRIPTS = barnowl
+noinst_SCRIPTS = barnowl
 check_SCRIPTS = tester
 
-barnowl tester: %: barnowl-wrapper.in %.bin Makefile
+barnowl tester: %: barnowl-wrapper.in bin/% Makefile
         sed \
             -e 's,[@]abs_srcdir[@],$(abs_srcdir),g' \
@@ -25 +25 @@
         chmod +x $@
 
-barnowl_bin_SOURCES = $(BASE_SRCS) \
+bin_barnowl_SOURCES = $(BASE_SRCS) \
      owl.h owl_perl.h \
      owl.c
-nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H)
+nodist_bin_barnowl_SOURCES = $(GEN_C) $(GEN_H)
 
 dist_man_MANS = doc/barnowl.1
 dist_doc_DATA = doc/intro.txt doc/advanced.txt
 
-barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
+bin_barnowl_LDADD = compat/libcompat.a libfaim/libfaim.a
 
-tester_bin_SOURCES = $(BASE_SRCS) \
+bin_tester_SOURCES = $(BASE_SRCS) \
      owl.h owl_perl.h \
      tester.c
-nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)
+nodist_bin_tester_SOURCES = $(GEN_C) $(GEN_H)
 
-tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
+bin_tester_LDADD = compat/libcompat.a libfaim/libfaim.a
 
 TESTS=runtests.sh
@@ -96 +96 @@
         $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
 
-do_transform = $(shell echo '$(1)' | sed '$(transform)')
-install-exec-hook:
-        mv -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl.bin) \
-              $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
-
-uninstall-local:
-        rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
-
-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS)
+CLEANFILES = $(BUILT_SOURCES) $(noinst_SCRIPTS) $(check_SCRIPTS)
 EXTRA_DIST = \
     autogen.sh \

barnowl-wrapper.in

@@ -1 +1 @@
 #!/bin/sh
 # This is a wrapper script to point BARNOWL_DATA_DIR at the source dir
-# if we're running from a build tree. barnowl.bin is the actual built
+# if we're running from a build tree. bin/barnowl is the actual built
 # binary.
 
-EXE="$0.bin"
+EXE="@abs_builddir@/bin/$(basename "$0")"
 
 if test ! -x "$EXE"; then