diff options
| author | Joachim Nilsson <troglobit@gmail.com> | 2019-09-29 15:02:19 +0200 |
|---|---|---|
| committer | Joachim Nilsson <troglobit@gmail.com> | 2019-09-29 15:02:19 +0200 |
| commit | 1814fd7eafc0817b99713e7d07bc79e784fd27fb (patch) | |
| tree | 93e157770b2bb4db5b59318968def0ee144adafa | |
| parent | ac1dfea8c14071291f7e090420d660991b1963c2 (diff) | |
| download | libnet-1814fd7eafc0817b99713e7d07bc79e784fd27fb.tar.gz | |
Simplify and clean up top Makefile.am a bit
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile.am | 64 |
2 files changed, 20 insertions, 46 deletions
diff --git a/.travis.yml b/.travis.yml index ccf8568..f59694b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ script: - ./autogen.sh - ./configure --prefix=/ --disable-silent-rules - make clean - - make -C doc doc + - make doc - make - make install-strip DESTDIR=/tmp/libnet - tree /tmp/libnet diff --git a/Makefile.am b/Makefile.am index 2d932eb..e7b9e80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,60 +3,34 @@ # Copyright (c) 1998 - 2004 Mike D. Schiffman <mike@infonexus.com> # All rights reserved. # -# Process this file with automake to produce a Makefile.in script. - -DISTCHECK_CONFIGURE_FLAGS = \ - --enable-doxygen-doc \ - --disable-samples - -# Include macros implemented in the directory m4 -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -SUBDIRS = include src doc win32 - -if ENABLE_SAMPLES -SUBDIRS += sample -endif - -# deleting doc/libnet.tag forces make to rebuild all docs (if enabled) -CLEANFILES = doc/libnet.tag libnet.pc -DISTCLEANFILES = fixmanpages +DISTCHECK_CONFIGURE_FLAGS = --enable-doxygen-doc --disable-samples +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnet.pc +doc_DATA = README.md LICENSE +EXTRA_DIST = README.md LICENSE \ + msvcbuild.bat \ + README.win32 \ + autogen.sh \ + map-pblock-types +SUBDIRS = include src win32 + +if ENABLE_DOXYGEN +SUBDIRS += doc +endif +if ENABLE_SAMPLES +SUBDIRS += sample +endif +# +# Doxygen rules from m4/ax_prog_doxygen.m4 +# @DX_RULES@ doc: doxygen-doc $(AM_V_GEN)cd $(DX_DOCDIR) && ./fixmanpages && cd - -doc_DATA = README.md LICENSE -EXTRA_DIST = README.md LICENSE \ - msvcbuild.bat \ - README.win32 \ - autogen.sh \ - map-pblock-types - -APIDOCS = $(top_srcdir)/doc/api/*.html \ - $(top_srcdir)/doc/api/*.css \ - $(top_srcdir)/doc/api/*.png - -APIDOC_DEPS = $(top_srcdir)/doc/libnet.doxygen.conf \ - $(top_srcdir)/doc/libnet.Pod \ - $(top_srcdir)/doc/libnet-config.Pod \ - $(top_srcdir)/doc/libnet_api_header.html_tmpl \ - $(top_srcdir)/doc/libnet_api_footer.html_tmpl \ - $(top_srcdir)/doc/libnet_api_stylesheet.css_tmpl - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(docdir)/api - $(INSTALL_DATA) `test -f doc/api/index.html || echo $(srcdir)/`doc/api/*.png $(DESTDIR)$(docdir)/api - $(INSTALL_DATA) `test -f doc/api/index.html || echo $(srcdir)/`doc/api/*.css $(DESTDIR)$(docdir)/api - $(INSTALL_DATA) `test -f doc/api/index.html || echo $(srcdir)/`doc/api/*.html $(DESTDIR)$(docdir)/api - -uninstall-local: - rm -rf $(DESTDIR)$(docdir)/api - # (GNU make only) Unless we say otherwise, spare us the # “Entering/Leaving directory ...” messages GNUMAKEFLAGS = $(if $(value VERBOSE),,--no-print-directory) |