diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2009-10-04 10:53:31 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2009-10-04 10:53:31 +0200 |
| commit | a97e551d7dbc294cfe249ac78e6e0af2ba8ac7bc (patch) | |
| tree | 60ca1510e469dbe6caadd5239c929ce718e815ca /Makefile.am | |
| parent | f96e0b14bba177b055b50064b430115ff245ea1a (diff) | |
| parent | 2861f9cf845107870f9d5e9898e5cd4baba8d8f7 (diff) | |
Merge remote branch 'origin/master' into obsd
Conflicts:
xinit.c
xinitrc.cpp
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 76ee2c3..3b76f88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,8 @@ XINITDIR = $(datadir)/X11/xinit bin_PROGRAMS = xinit bin_SCRIPTS = startx -AM_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\" +AM_CFLAGS = $(CWARNFLAGS) $(XINIT_CFLAGS) +AM_CPPFLAGS = -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\" xinit_LDADD = $(XINIT_LIBS) xinit_SOURCES = \ |