Changeset a223b6b


Ignore:
Timestamp:
Apr 19, 2013, 3:22:54 AM (4 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Branches:
master
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:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r78b9503 ra223b6b  
    44GIT_FLAGS := $(if $(GIT_DESCRIPTION),-DGIT_VERSION=$(GIT_DESCRIPTION:barnowl-%=%))
    55
    6 bin_PROGRAMS = barnowl.bin
     6bin_PROGRAMS = bin/barnowl
    77if ENABLE_ZCRYPT
    88bin_PROGRAMS += zcrypt
     
    1111zcrypt_SOURCES = zcrypt.c filterproc.c
    1212
    13 check_PROGRAMS = tester.bin
     13check_PROGRAMS = bin/tester
    1414dist_check_DATA = t
    1515dist_check_SCRIPTS = runtests.sh
    1616
    17 bin_SCRIPTS = barnowl
     17noinst_SCRIPTS = barnowl
    1818check_SCRIPTS = tester
    1919
    20 barnowl tester: %: barnowl-wrapper.in %.bin Makefile
     20barnowl tester: %: barnowl-wrapper.in bin/% Makefile
    2121        sed \
    2222            -e 's,[@]abs_srcdir[@],$(abs_srcdir),g' \
     
    2525        chmod +x $@
    2626
    27 barnowl_bin_SOURCES = $(BASE_SRCS) \
     27bin_barnowl_SOURCES = $(BASE_SRCS) \
    2828     owl.h owl_perl.h \
    2929     owl.c
    30 nodist_barnowl_bin_SOURCES = $(GEN_C) $(GEN_H)
     30nodist_bin_barnowl_SOURCES = $(GEN_C) $(GEN_H)
    3131
    3232dist_man_MANS = doc/barnowl.1
    3333dist_doc_DATA = doc/intro.txt doc/advanced.txt
    3434
    35 barnowl_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
     35bin_barnowl_LDADD = compat/libcompat.a libfaim/libfaim.a
    3636
    37 tester_bin_SOURCES = $(BASE_SRCS) \
     37bin_tester_SOURCES = $(BASE_SRCS) \
    3838     owl.h owl_perl.h \
    3939     tester.c
    40 nodist_tester_bin_SOURCES = $(GEN_C) $(GEN_H)
     40nodist_bin_tester_SOURCES = $(GEN_C) $(GEN_H)
    4141
    42 tester_bin_LDADD = compat/libcompat.a libfaim/libfaim.a
     42bin_tester_LDADD = compat/libcompat.a libfaim/libfaim.a
    4343
    4444TESTS=runtests.sh
     
    9696        $(COMPILE) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
    9797
    98 do_transform = $(shell echo '$(1)' | sed '$(transform)')
    99 install-exec-hook:
    100         mv -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl.bin) \
    101               $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
    102 
    103 uninstall-local:
    104         rm -f $(DESTDIR)$(bindir)/$(call do_transform,barnowl)
    105 
    106 CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) $(check_SCRIPTS)
     98CLEANFILES = $(BUILT_SOURCES) $(noinst_SCRIPTS) $(check_SCRIPTS)
    10799EXTRA_DIST = \
    108100    autogen.sh \
  • barnowl-wrapper.in

    r1dba5bd ra223b6b  
    11#!/bin/sh
    22# This is a wrapper script to point BARNOWL_DATA_DIR at the source dir
    3 # if we're running from a build tree. barnowl.bin is the actual built
     3# if we're running from a build tree. bin/barnowl is the actual built
    44# binary.
    55
    6 EXE="$0.bin"
     6EXE="@abs_builddir@/bin/$(basename "$0")"
    77
    88if test ! -x "$EXE"; then
Note: See TracChangeset for help on using the changeset viewer.