Skip to content

Commit

Permalink
[build] fix conditional build to pass make distcheck
Browse files Browse the repository at this point in the history
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
  • Loading branch information
fabbione committed Oct 21, 2016
1 parent 60428b9 commit de956fe
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions Makefile.am
Expand Up @@ -46,6 +46,7 @@ all-local: $(SPEC) $(DEBCHANGELOG) $(DEBPOSTINST)

clean-local:
rm -f $(SPEC)
rm -f $(DEBPOSTINST)

distclean-local:
rm -f $(PACKAGE_NAME)-*.tar.*
Expand Down
4 changes: 4 additions & 0 deletions init/Makefile.am
Expand Up @@ -13,6 +13,8 @@ include $(top_srcdir)/build-aux/check.mk
EXTRA_DIST = kronosnetd.in kronosnetd.service.in \
kronosnetd.default

if BUILD_KRONOSNETD

systemdconfdir = $(SYSTEMDDIR)
systemdconf_DATA = kronosnetd.service

Expand Down Expand Up @@ -41,3 +43,5 @@ all-local: $(initscript_SCRIPTS) $(systemdconf_DATA)

clean-local:
rm -rf $(initscript_SCRIPTS) $(systemdconf_DATA)

endif
10 changes: 5 additions & 5 deletions kronosnetd/Makefile.am
Expand Up @@ -10,8 +10,6 @@ MAINTAINERCLEANFILES = Makefile.in kronostnetd.logrotate

include $(top_srcdir)/build-aux/check.mk

if BUILD_KRONOSNETD

EXTRA_DIST = kronosnetd.logrotate.in

noinst_HEADERS = \
Expand All @@ -24,9 +22,6 @@ noinst_HEADERS = \
vty_cli_cmds.h \
vty_utils.h

sbin_PROGRAMS = kronosnetd \
knet-keygen

kronosnetd_SOURCES = \
cfg.c \
etherfilter.c \
Expand Down Expand Up @@ -55,6 +50,11 @@ knet_keygen_SOURCES = keygen.c

knet_keygen_CPPFLAGS = -I$(top_srcdir)/libknet

if BUILD_KRONOSNETD

sbin_PROGRAMS = kronosnetd \
knet-keygen

dist_man_MANS = kronosnetd.8 knet-keygen.8

install-exec-local:
Expand Down
4 changes: 2 additions & 2 deletions libtap/Makefile.am
Expand Up @@ -15,15 +15,15 @@ SYMFILE = libtap_exported_syms

EXTRA_DIST = $(SYMFILE) tap_updown_bad tap_updown_good api-test-coverage

if BUILD_LIBTAP

sources = libtap.c

libversion = 0:0:0

# override global LIBS that pulls in lots of craft we don't need here
LIBS = -lpthread

if BUILD_LIBTAP

include_HEADERS = libtap.h

pkgconfigdir = $(libdir)/pkgconfig
Expand Down

0 comments on commit de956fe

Please sign in to comment.