diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2010-02-11 23:15:01 +0100 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2010-02-11 23:15:01 +0100 |
| commit | 2c877b3db01e21be5c4796238e4053f8abb04abf (patch) | |
| tree | d229297963b2b82fbd850450c3adfef9c6177393 | |
| parent | gtk-redshift: Use absolute path when launching redshift process. (diff) | |
| download | redshift-ng-2c877b3db01e21be5c4796238e4053f8abb04abf.tar.gz redshift-ng-2c877b3db01e21be5c4796238e4053f8abb04abf.tar.bz2 redshift-ng-2c877b3db01e21be5c4796238e4053f8abb04abf.tar.xz | |
Switch to heirarchial makefiles. Seems to be the only way to make
distcheck happy :(
| -rw-r--r-- | Makefile.am | 59 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 38 | ||||
| -rw-r--r-- | src/gtk-redshift/Makefile.am | 19 |
4 files changed, 61 insertions, 57 deletions
diff --git a/Makefile.am b/Makefile.am index 3d64d82..70df15e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,68 +1,13 @@ -SUBDIRS = po +SUBDIRS = src po ACLOCAL_AMFLAGS = -I m4 -# I18n -localedir = $(datadir)/locale -INCLUDES = -DLOCALEDIR=\"$(localedir)\" - -# redshift Program -bin_PROGRAMS = redshift - -redshift_SOURCES = \ - src/redshift.c \ - src/colorramp.c src/colorramp.h \ - src/solar.c src/solar.h - -EXTRA_redshift_SOURCES = \ - src/randr.c src/randr.h \ - src/vidmode.c src/vidmode.h - -AM_CFLAGS = -redshift_LDADD = @LIBINTL@ -EXTRA_DIST = - -if ENABLE_RANDR -redshift_SOURCES += src/randr.c src/randr.h -AM_CFLAGS += $(XCB_CFLAGS) $(XCB_RANDR_CFLAGS) -redshift_LDADD += \ - $(XCB_LIBS) $(XCB_CFLAGS) \ - $(XCB_RANDR_LIBS) $(XCB_RANDR_CFLAGS) -endif - -if ENABLE_VIDMODE -redshift_SOURCES += src/vidmode.c src/vidmode.h -AM_CFLAGS += $(X11_CFLAGS) $(XF86VM_CFLAGS) -redshift_LDADD += \ - $(X11_LIBS) $(X11_CFLAGS) \ - $(XF86VM_LIBS) $(XF86VM_CFLAGS) -endif - -# gtk-redshift Script -if ENABLE_GTK -gtk_redshift_PYTHON = \ - src/gtk-redshift/__init__.py \ - src/gtk-redshift/statusicon.py \ - src/gtk-redshift/defs.py -gtk_redshiftdir = $(pythondir)/gtk_redshift - -dist_bin_SCRIPTS = src/gtk-redshift/gtk-redshift -EXTRA_DIST += src/gtk-redshift/defs.py.in -endif - # Icons icondir = @datadir@/icons/hicolor/scalable/apps icon_DATA = data/icons/hicolor/scalable/apps/redshift.svg -EXTRA_DIST += $(icon_DATA) - - -CLEANFILES = src/gtk-redshift/defs.py +EXTRA_DIST = $(icon_DATA) -# Local python definitions -src/gtk-redshift/defs.py: src/gtk-redshift/defs.py.in - sed -e "s|\@bindir\@|$(bindir)|g" \ - -e "s|\@localedir\@|$(localedir)|g" $< > $@ # Update PO translations .PHONY: update-po diff --git a/configure.ac b/configure.ac index 5a743ac..feb8234 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,8 @@ AC_CHECK_FUNCS([setlocale strchr floor pow clock_gettime]) AC_CONFIG_FILES([ Makefile po/Makefile.in + src/Makefile + src/gtk-redshift/Makefile ]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..f23ab0b --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,38 @@ + +SUBDIRS = gtk-redshift + +# I18n +localedir = $(datadir)/locale +INCLUDES = -DLOCALEDIR=\"$(localedir)\" + +# redshift Program +bin_PROGRAMS = redshift + +redshift_SOURCES = \ + redshift.c \ + colorramp.c colorramp.h \ + solar.c solar.h + +EXTRA_redshift_SOURCES = \ + randr.c randr.h \ + vidmode.c vidmode.h + +AM_CFLAGS = +redshift_LDADD = @LIBINTL@ +EXTRA_DIST = + +if ENABLE_RANDR +redshift_SOURCES += randr.c randr.h +AM_CFLAGS += $(XCB_CFLAGS) $(XCB_RANDR_CFLAGS) +redshift_LDADD += \ + $(XCB_LIBS) $(XCB_CFLAGS) \ + $(XCB_RANDR_LIBS) $(XCB_RANDR_CFLAGS) +endif + +if ENABLE_VIDMODE +redshift_SOURCES += vidmode.c vidmode.h +AM_CFLAGS += $(X11_CFLAGS) $(XF86VM_CFLAGS) +redshift_LDADD += \ + $(X11_LIBS) $(X11_CFLAGS) \ + $(XF86VM_LIBS) $(XF86VM_CFLAGS) +endif diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am new file mode 100644 index 0000000..d0d8695 --- /dev/null +++ b/src/gtk-redshift/Makefile.am @@ -0,0 +1,19 @@ + +if ENABLE_GTK +gtk_redshift_PYTHON = \ + __init__.py \ + statusicon.py +nodist_gtk_redshift_PYTHON = \ + defs.py +gtk_redshiftdir = $(pythondir)/gtk_redshift + +dist_bin_SCRIPTS = gtk-redshift +EXTRA_DIST = defs.py.in +endif + +CLEANFILES = defs.py + +# Local python definitions +defs.py: defs.py.in + sed -e "s|\@bindir\@|$(bindir)|g" \ + -e "s|\@localedir\@|$(localedir)|g" $< > $@ |