mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure all targets use GCC_CFLAGS

Browse Source
This commit is contained in:
Kristian Høgsberg 2011-05-06 14:49:06 -04:00
parent 5a43db5041
commit bbefb136d1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compositor/Makefile.am
View File

@ -5,10 +5,9 @@ AM_CPPFLAGS = \
-DMODULEDIR='"$(moduledir)"' \ -DMODULEDIR='"$(moduledir)"' \
$(COMPOSITOR_CFLAGS) $(COMPOSITOR_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS)
wayland_compositor_LDFLAGS = -export-dynamic wayland_compositor_LDFLAGS = -export-dynamic
wayland_compositor_LDADD = $(COMPOSITOR_LIBS) $(DLOPEN_LIBS) wayland_compositor_LDADD = $(COMPOSITOR_LIBS) $(DLOPEN_LIBS)
wayland_compositor_CFLAGS = $(GCC_CFLAGS)
wayland_compositor_SOURCES = \ wayland_compositor_SOURCES = \
compositor.c \ compositor.c \
@ -36,7 +35,7 @@ if ENABLE_X11_COMPOSITOR
x11_backend = x11-backend.la x11_backend = x11-backend.la
x11_backend_la_LDFLAGS = -module -avoid-version x11_backend_la_LDFLAGS = -module -avoid-version
x11_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(X11_COMPOSITOR_LIBS) x11_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(X11_COMPOSITOR_LIBS)
x11_backend_la_CFLAGS = $(X11_COMPOSITOR_CFLAGS) x11_backend_la_CFLAGS = $(X11_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
x11_backend_la_SOURCES = compositor-x11.c x11_backend_la_SOURCES = compositor-x11.c
endif endif
@ -44,7 +43,7 @@ if ENABLE_DRM_COMPOSITOR
drm_backend = drm-backend.la drm_backend = drm-backend.la
drm_backend_la_LDFLAGS = -module -avoid-version drm_backend_la_LDFLAGS = -module -avoid-version
drm_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(DRM_COMPOSITOR_LIBS) drm_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(DRM_COMPOSITOR_LIBS)
drm_backend_la_CFLAGS = $(DRM_COMPOSITOR_CFLAGS) drm_backend_la_CFLAGS = $(DRM_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
drm_backend_la_SOURCES = compositor-drm.c tty.c evdev.c drm_backend_la_SOURCES = compositor-drm.c tty.c evdev.c
endif endif
@ -52,7 +51,7 @@ if ENABLE_WAYLAND_COMPOSITOR
wayland_backend = wayland-backend.la wayland_backend = wayland-backend.la
wayland_backend_la_LDFLAGS = -module -avoid-version wayland_backend_la_LDFLAGS = -module -avoid-version
wayland_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(WAYLAND_COMPOSITOR_LIBS) wayland_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(WAYLAND_COMPOSITOR_LIBS)
wayland_backend_la_CFLAGS = $(WAYLAND_COMPOSITOR_CFLAGS) wayland_backend_la_CFLAGS = $(WAYLAND_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
wayland_backend_la_SOURCES = compositor-wayland.c wayland_backend_la_SOURCES = compositor-wayland.c
endif endif
@ -60,7 +59,7 @@ if ENABLE_OPENWFD_COMPOSITOR
openwfd_backend = openwfd-backend.la openwfd_backend = openwfd-backend.la
openwfd_backend_la_LDFLAGS = -module -avoid-version openwfd_backend_la_LDFLAGS = -module -avoid-version
openwfd_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(OPENWFD_COMPOSITOR_LIBS) openwfd_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(OPENWFD_COMPOSITOR_LIBS)
openwfd_backend_la_CFLAGS = $(OPENWFD_COMPOSITOR_CFLAGS) openwfd_backend_la_CFLAGS = $(OPENWFD_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
openwfd_backend_la_SOURCES = compositor-openwfd.c tty.c evdev.c openwfd_backend_la_SOURCES = compositor-openwfd.c tty.c evdev.c
endif endif
@ -68,6 +67,7 @@ if ENABLE_DESKTOP_SHELL
desktop_shell = desktop-shell.la desktop_shell = desktop-shell.la
desktop_shell_la_LDFLAGS = -module -avoid-version desktop_shell_la_LDFLAGS = -module -avoid-version
desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS) desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS)
desktop_shell_la_CFLAGS = $(GCC_CFLAGS)
desktop_shell_la_SOURCES = \ desktop_shell_la_SOURCES = \
shell.c \ shell.c \
switcher.c switcher.c
@ -77,6 +77,7 @@ if ENABLE_MEEGO_TABLET_SHELL
meego_tablet_shell = meego-tablet-shell.la meego_tablet_shell = meego-tablet-shell.la
meego_tablet_shell_la_LDFLAGS = -module -avoid-version meego_tablet_shell_la_LDFLAGS = -module -avoid-version
meego_tablet_shell_la_LIBADD = $(COMPOSITOR_LIBS) meego_tablet_shell_la_LIBADD = $(COMPOSITOR_LIBS)
meego_tablet_shell_la_CFLAGS = $(GCC_CFLAGS)
meego_tablet_shell_la_SOURCES = \ meego_tablet_shell_la_SOURCES = \
meego-tablet-shell.c \ meego-tablet-shell.c \
meego-tablet-shell.h \ meego-tablet-shell.h \