diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-12 09:52:44 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-12 09:52:44 -0400 |
| commit | c7514e8f0d19a833257497caff413bb4dfae6eb4 (patch) | |
| tree | 7dc4bbd5b5a162b5b0b0277c68f7b7e3c6dd457b /Makefile.am | |
| parent | 85c1c22d04d369529ec4c3b6f608270f4f394cb5 (diff) | |
| parent | fcd58b0ffd0935567437b89bb077f60195336764 (diff) | |
| download | gtk+-c7514e8f0d19a833257497caff413bb4dfae6eb4.tar.gz | |
Merge branch 'gdk-backend-wayland'
Conflicts:
Makefile.am
configure.ac
gdk/Makefile.am
gtk/gtksettings.c
gtk/gtkwindow.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index df52bcc6b0..050202dd51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,11 +55,11 @@ MAINTAINERCLEANFILES = \ ## Copy .pc files to target-specific names -gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc: gtk+-3.0.pc +gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc rm -f $@ && \ cp gtk+-3.0.pc $@ -gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc: gdk-3.0.pc +gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc rm -f $@ && \ cp gdk-3.0.pc $@ |