diff options
| author | Josh Triplett <josh@freedesktop.org> | 2006-04-28 16:33:20 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2006-04-28 16:33:20 -0700 |
| commit | b168a8df6c8462ab3c2ff2949eae95e2dc266d77 (patch) | |
| tree | c2ae47645a1f3159c1759f501bb81782081fed64 | |
| parent | 7a021da9c1272c0e48ed3a990694c39f2a4d1611 (diff) | |
| parent | a285ac2f570e52793efe0a2d7ef76e32fdb28fb5 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb0.1
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 12ee08b..7adb7e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,13 +13,13 @@ bin_PROGRAMS = dpms hypnomoire rendertest xcb-test xcbrandr xcbxf86dri \ hypnomoire_CFLAGS = $(XCBAUX_CFLAGS) hypnomoire_LDADD = $(XCBAUX_LIBS) -lm -lpthread -hypnomoire_SOURCES = hypnomoire.c reply_formats.c +hypnomoire_SOURCES = hypnomoire.c reply_formats.c reply_formats.h xcbdpyinfo_SOURCES = xcbdpyinfo.c xcb_test_CFLAGS = $(XCBAUX_CFLAGS) xcb_test_LDADD = $(XCBAUX_LIBS) -lpthread -xcb_test_SOURCES = main.c reply_formats.c +xcb_test_SOURCES = main.c reply_formats.c reply_formats.h dpms_CFLAGS = $(XCBDPMS_CFLAGS) dpms_LDADD = $(XCBDPMS_LIBS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 435eb98..67e97ca 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,10 +6,10 @@ INCLUDES = $(XCBAUX_CFLAGS) $(XCBIMAGE_CFLAGS) bin_PROGRAMS = julia lissajoux flames julia_LDADD = $(XCBAUX_LIBS) $(XCBIMAGE_LIBS) -julia_SOURCES = julia.c +julia_SOURCES = julia.c julia.h lissajoux_LDADD = $(XCBAUX_LIBS) $(XCBIMAGE_LIBS) -lm -lissajoux_SOURCES =lissajoux.c +lissajoux_SOURCES = lissajoux.c lissajoux.h flames_CFLAGS = -O3 flames_LDADD = $(XCBAUX_LIBS) $(XCBIMAGE_LIBS) $(XCBICCCM_LIBS) |