diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2006-11-30 13:34:21 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-12-01 16:35:16 +1100 |
| commit | 6f9746f3041217574205137cba1f279afa5b2a13 (patch) | |
| tree | 98274c963ac18e145a3f47006e4d153bb675a072 | |
| parent | 2bc783ef63f68a0a9ab9f2f80b1ceaca39b4a278 (diff) | |
Move twin demo binaries to twin_demos/
This change moved the twin demo binaries to the twin_demos
subdirectory.
Also, don't include these demos in the install - they can be run from
the build directory instead.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | Makefile.am | 36 | ||||
| -rw-r--r-- | twin_demos/ftwin.c (renamed from ftwin.c) | 0 | ||||
| -rw-r--r-- | twin_demos/ftwin.cursor (renamed from ftwin.cursor) | bin | 10004 -> 10004 bytes | |||
| -rw-r--r-- | twin_demos/xtwin.c (renamed from xtwin.c) | 0 |
4 files changed, 23 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 3c001df..90581e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,17 @@ AM_CFLAGS = @WARN_CFLAGS@ -EXTRA_PROGRAMS = xtwin ftwin twin_ttf +EXTRA_PROGRAMS = bin_PROGRAMS = lib_LTLIBRARIES = libtwin.la pkginclude_HEADERS = twin.h twin_def.h if TWIN_X11 -bin_PROGRAMS += xtwin lib_LTLIBRARIES += libtwin-x11.la pkginclude_HEADERS += twin_x11.h endif if TWIN_FB -bin_PROGRAMS += ftwin lib_LTLIBRARIES += libtwin-fbdev.la pkginclude_HEADERS += twin_fbdev.h endif @@ -63,22 +61,32 @@ libtwin_x11_la_CPPFLAGS = @X_CFLAGS@ libtwin_x11_la_LDFLAGS = -version-info @LIB_VERSION@ libtwin_x11_la_SOURCES = twin_x11.c -xtwin_SOURCES = xtwin.c -xtwin_CPPFLAGS = @X_CFLAGS@ -I$(top_srcdir)/twin_demos -xtwin_LDADD = twin_demos/libtwin_demos.a \ - libtwin.la libtwin-x11.la @X_LIBS@ -lm - libtwin_fbdev_la_LDFLAGS = -version-info @LIB_VERSION@ libtwin_fbdev_la_SOURCES = twin_fbdev.c -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 +EXTRA_PROGRAMS += twin_demos/xtwin twin_demos/ftwin +noinst_PROGRAMS = noinst_LIBRARIES = twin_demos/libtwin_demos.a +if TWIN_X11 +noinst_PROGRAMS += twin_demos/xtwin +endif + +if TWIN_FB +noinst_PROGRAMS += twin_demos/ftwin +endif + +twin_demos_xtwin_SOURCES = twin_demos/xtwin.c +twin_demos_xtwin_CPPFLAGS = @X_CFLAGS@ -I$(top_srcdir)/twin_demos +twin_demos_xtwin_LDADD = twin_demos/libtwin_demos.a \ + libtwin.la libtwin-x11.la @X_LIBS@ -lm + +twin_demos_ftwin_SOURCES = twin_demos/ftwin.c +twin_demos_ftwin_CPPFLAGS = -I$(top_srcdir)/twin_demos +twin_demos_ftwin_LDADD = twin_demos/libtwin_demos.a \ + libtwin.la libtwin-fbdev.la libtwin-mouse.la -lm + 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 \ @@ -90,6 +98,8 @@ twin_demos_libtwin_demos_a_SOURCES = \ twin_demos/twin_text.c twin_demos/twin_text.h # twin_ttf +EXTRA_PROGRAMS += twin_ttf/twin_ttf + if TWIN_TTF bin_PROGRAMS += twin_ttf/twin_ttf endif diff --git a/ftwin.c b/twin_demos/ftwin.c index 1d5c487..1d5c487 100644 --- a/ftwin.c +++ b/twin_demos/ftwin.c diff --git a/ftwin.cursor b/twin_demos/ftwin.cursor Binary files differindex 785a7e4..785a7e4 100644 --- a/ftwin.cursor +++ b/twin_demos/ftwin.cursor diff --git a/xtwin.c b/twin_demos/xtwin.c index 82381db..82381db 100644 --- a/xtwin.c +++ b/twin_demos/xtwin.c |