Skip to content

Commit

Permalink
Avoid recursive make calls for docs, etc and avroot that build nothing.
Browse files Browse the repository at this point in the history
Instead of using recursive makefiles, declare the installed files in
the top level makefile, like it's being done for header files.

Avoiding recursive make calls reduce the overhead that automake adds
to the build process.
  • Loading branch information
Flameeyes committed Oct 24, 2008
1 parent 43b8e97 commit abe2af7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 18 deletions.
16 changes: 12 additions & 4 deletions Makefile.am
Expand Up @@ -3,10 +3,7 @@ SUBDIRS = mediathread \
rtp \
rtcp \
rtsp \
src \
docs \
etc \
avroot
src

noinst_HEADERS = \
include/fenice/utils.h \
Expand Down Expand Up @@ -45,3 +42,14 @@ ACLOCAL_AMFLAGS = -I m4
FENICE_AVROOT_DIR = $(fenice_avroot_dir)
FENICE_LOG_FILE = `basename $(fenice_log_file)`

avrootdir = $(fenice_avroot_dir)

dist_avroot_DATA = \
avroot/h264.ds \
avroot/h264_scramble.ds \
avroot/test.mov

feng_confdir = $(fenice_conf_dir)
dist_feng_conf_DATA = etc/feng.conf

dist_man_MANS = docs/feng.1
3 changes: 0 additions & 3 deletions avroot/Makefile.am

This file was deleted.

3 changes: 0 additions & 3 deletions configure.ac
Expand Up @@ -216,9 +216,6 @@ AC_CONFIG_FILES([rtcp/Makefile])
AC_CONFIG_FILES([rtsp/Makefile])
AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([conf/Makefile])
AC_CONFIG_FILES([docs/Makefile])
AC_CONFIG_FILES([etc/Makefile])
AC_CONFIG_FILES([avroot/Makefile])
AC_CONFIG_FILES([etc/feng.conf])
AC_CONFIG_FILES([etc/feng-uninstalled.conf])
AC_CONFIG_FILES([Doxyfile])
Expand Down
6 changes: 0 additions & 6 deletions docs/Makefile.am

This file was deleted.

2 changes: 0 additions & 2 deletions etc/Makefile.am

This file was deleted.

0 comments on commit abe2af7

Please sign in to comment.