diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2006-11-30 12:17:01 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-12-01 14:21:14 +1100 |
| commit | 2bc783ef63f68a0a9ab9f2f80b1ceaca39b4a278 (patch) | |
| tree | f805ac532b23320cdd84e984dfd4d424c6565e66 | |
| parent | 1a9d1d716f6fc188c490f0638eccc57dfb6c10fb (diff) | |
Recursive make considered harmful
Change the Makefile.am to not use recursive make - this will allow
future dependencies on the twin library without too much automake pain.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | Makefile.am | 30 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | twin_demos/Makefile.am | 13 | ||||
| -rw-r--r-- | twin_ttf/Makefile.am | 15 |
4 files changed, 28 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index 60e0d53..3c001df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,6 @@ AM_CFLAGS = @WARN_CFLAGS@ -SUBDIRS=twin_ttf twin_demos - -EXTRA_PROGRAMS = xtwin ftwin +EXTRA_PROGRAMS = xtwin ftwin twin_ttf bin_PROGRAMS = lib_LTLIBRARIES = libtwin.la @@ -77,3 +75,29 @@ ftwin_SOURCES = ftwin.c ftwin_CPPFLAGS = -I$(top_srcdir)/twin_demos ftwin_LDADD = twin_demos/libtwin_demos.a \ libtwin.la libtwin-fbdev.la libtwin-mouse.la -lm + +# demo twin applications +noinst_LIBRARIES = twin_demos/libtwin_demos.a + +twin_demos_libtwin_demos_a_CFLAGS = @WARN_CFLAGS@ -I$(top_srcdir)/twin_demos +twin_demos_libtwin_demos_a_SOURCES = \ + twin_demos/twin_calc.c twin_demos/twin_calc.h \ + twin_demos/twin_clock.c twin_demos/twin_clock.h \ + twin_demos/twin_demo.c twin_demos/twin_demo.h \ + twin_demos/twin_demoline.c twin_demos/twin_demoline.h \ + twin_demos/twin_demospline.c twin_demos/twin_demospline.h \ + twin_demos/twin_hello.c twin_demos/twin_hello.h \ + twin_demos/twin_text.c twin_demos/twin_text.h + +# twin_ttf +if TWIN_TTF +bin_PROGRAMS += twin_ttf/twin_ttf +endif + +twin_ttf_twin_ttf_SOURCES = \ + twin_ttf/twin_ttf.h \ + twin_ttf/twin_ttf.c + +twin_ttf_twin_ttf_LDADD = @FREETYPE_LIBS@ -lm +twin_ttf_twin_ttf_CFLAGS = -g @WARN_CFLAGS@ +twin_ttf_twin_ttf_CPPFLAGS = @FREETYPE_CFLAGS@ -I$(top_srcdir)/twin_ttf diff --git a/configure.ac b/configure.ac index f2f227a..17b2b2d 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,4 @@ AC_MSG_NOTICE([twin_ttf tool: $twin_ttf]) AC_MSG_NOTICE([linux mouse: $twin_mouse]) AC_OUTPUT([Makefile - twin.pc - twin_ttf/Makefile - twin_demos/Makefile]) + twin.pc]) diff --git a/twin_demos/Makefile.am b/twin_demos/Makefile.am deleted file mode 100644 index b4020c9..0000000 --- a/twin_demos/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ - -noinst_LIBRARIES = libtwin_demos.a - -libtwin_demos_a_CFLAGS = @WARN_CFLAGS@ -libtwin_demos_a_CPPFLAGS = -I$(top_srcdir) -libtwin_demos_a_SOURCES = twin_calc.c twin_calc.h \ - twin_clock.c twin_clock.h \ - twin_demo.c twin_demo.h \ - twin_demoline.c twin_demoline.h \ - twin_demospline.c twin_demospline.h \ - twin_hello.c twin_hello.h \ - twin_text.c twin_text.h - diff --git a/twin_ttf/Makefile.am b/twin_ttf/Makefile.am deleted file mode 100644 index b9d9379..0000000 --- a/twin_ttf/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -AM_CFLAGS=-g -INCLUDES= @WARN_CFLAGS@ @FREETYPE_CFLAGS@ - -EXTRA_PROGRAMS = twin_ttf -bin_PROGRAMS = - -if TWIN_TTF -bin_PROGRAMS += twin_ttf -endif - -twin_ttf_SOURCES = \ - twin_ttf.h \ - twin_ttf.c - -twin_ttf_LDADD = @FREETYPE_LIBS@ -lm |