[gtkglext] Regroup noinst_PROGRAMS.
- From: Ralf Corsépius <rcorsepius src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtkglext] Regroup noinst_PROGRAMS.
- Date: Sat, 26 Dec 2009 10:31:44 +0000 (UTC)
commit c1adc1947ff2321fd89f50c153f4553bb5438015
Author: Ralf Corsepius <rcorsepius src gnome org>
Date: Sat Dec 26 11:29:00 2009 +0100
Regroup noinst_PROGRAMS.
examples/Makefile.am | 69 ++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 33 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 3cfc5bd..79bce0a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -31,96 +31,99 @@ AM_LDFLAGS = \
$(GLU_LIBS) \
$(GDKGLEXT_WIN_LIBS)
-noinst_PROGRAMS = \
- low-level \
- simple \
- simple-mixed \
- pixmap \
- pixmap-mixed \
- share-lists \
- color \
- font \
- button \
- shapes \
- logo \
- gears \
- multiarb \
- viewlw \
- rotating-square \
- coolwave \
- coolwave2 \
- template \
- scribble-gl \
- font-pangoft2 \
- font-pangoft2-tex
-
-if PLATFORM_WIN32
-noinst_PROGRAMS += wglinfo
-else
-noinst_PROGRAMS += simple-pbuffer-sgix
-noinst_PROGRAMS += glxinfo
-endif
-
noinst_LTLIBRARIES = libdrawshapes.la
libdrawshapes_la_SOURCES = drawshapes.c drawshapes.h
libdrawshapes_la_LIBADD = $(MATH_LIB)
+noinst_PROGRAMS =
+
+noinst_PROGRAMS += low-level
low_level_SOURCES = low-level.c
+low_level_LDFLAGS = $(GLU_LIBS)
+noinst_PROGRAMS += simple
simple_SOURCES = simple.c
+noinst_PROGRAMS += simple-mixed
simple_mixed_SOURCES = simple-mixed.c
+noinst_PROGRAMS += pixmap
pixmap_SOURCES = pixmap.c
+noinst_PROGRAMS += pixmap-mixed
pixmap_mixed_SOURCES = pixmap-mixed.c
+noinst_PROGRAMS += share-lists
share_lists_SOURCES = share-lists.c
+noinst_PROGRAMS += color
color_SOURCES = color.c
+noinst_PROGRAMS += font
font_SOURCES = font.c
+noinst_PROGRAMS += button
button_SOURCES = button.c
button_LDADD = $(LDADD) libdrawshapes.la
+noinst_PROGRAMS += shapes
shapes_SOURCES = trackball.h trackball.c shapes.c
shapes_LDADD = $(LDADD) libdrawshapes.la
+noinst_PROGRAMS += logo
logo_SOURCES = trackball.h trackball.c logo-model.h logo-model.c logo.c
EXTRA_logo_SOURCES = logo-g.c logo-t.c logo-k.c
+noinst_PROGRAMS += gears
gears_SOURCES = gears.c
+noinst_PROGRAMS += multiarb
multiarb_SOURCES = readtex.h readtex.c multiarb.c
+noinst_PROGRAMS += viewlw
viewlw_SOURCES = viewlw.c lw.h lw.c trackball.h trackball.c
+noinst_PROGRAMS += rotating-square
rotating_square_SOURCES = rotating-square.c
+noinst_PROGRAMS += coolwave
coolwave_SOURCES = coolwave.c
+noinst_PROGRAMS += coolwave2
coolwave2_SOURCES = coolwave2.c
+noinst_PROGRAMS += template
template_SOURCES = template.c
+noinst_PROGRAMS += scribble-gl
scribble_gl_SOURCES = scribble-gl.c
+noinst_PROGRAMS += font-pangoft2
font_pangoft2_SOURCES = font-pangoft2.c
font_pangoft2_CPPFLAGS = $(AM_CPPFLAGS) $(PANGOFT2_CFLAGS)
font_pangoft2_LDFLAGS = $(AM_LDFLAGS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2)
+noinst_PROGRAMS += font-pangoft2-tex
font_pangoft2_tex_SOURCES = font-pangoft2-tex.c
font_pangoft2_tex_CPPFLAGS = $(AM_CPPFLAGS) $(PANGOFT2_CFLAGS)
font_pangoft2_tex_LDFLAGS = $(AM_LDFLAGS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2)
+if !PLATFORM_WIN32
+noinst_PROGRAMS += simple-pbuffer-sgix
simple_pbuffer_sgix_SOURCES = simple-pbuffer-sgix.c
+endif
-glxinfo_SOURCES = glxinfo.c
-glxinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS) $(MATH_LIB)
-
+if PLATFORM_WIN32
+noinst_PROGRAMS += wglinfo
wglinfo_SOURCES = wglinfo.c
wglinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS)
+endif
+
+if !PLATFORM_WIN32
+noinst_PROGRAMS += glxinfo
+glxinfo_SOURCES = glxinfo.c
+glxinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS) $(MATH_LIB)
+endif
EXTRA_DIST += glade/README \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]