diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
| commit | cdc60fdcddbe5666aac11af34c6c030d4a670b99 (patch) | |
| tree | 4ec58bc0728308be9921485d5e79979bbc65a9b1 /xorg-server/hw/xfree86/fbdevhw/Makefile.am | |
| parent | 800da6ed70c65f5059726b7ce35030e9c7235f01 (diff) | |
| parent | a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 (diff) | |
| download | vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.gz vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.bz2 vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/fbdevhw/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xfree86/fbdevhw/Makefile.am | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/xorg-server/hw/xfree86/fbdevhw/Makefile.am b/xorg-server/hw/xfree86/fbdevhw/Makefile.am index 076b9741f..2a038905e 100644 --- a/xorg-server/hw/xfree86/fbdevhw/Makefile.am +++ b/xorg-server/hw/xfree86/fbdevhw/Makefile.am @@ -1,27 +1,19 @@ -module_LTLIBRARIES = libfbdevhw.la
-
-libfbdevhw_la_LDFLAGS = -avoid-version
-
-if FBDEVHW
-libfbdevhw_la_SOURCES = fbdevhw.c
-else
-libfbdevhw_la_SOURCES = fbdevhwstub.c
-endif
-
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-sdk_HEADERS = fbdevhw.h
-
-include $(top_srcdir)/cpprules.in
-
-drivermandir = $(DRIVER_MAN_DIR)
-driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX)
-CLEANFILES = $(driverman_DATA) fbdevhw.man
-
-fbdevhw.$(DRIVER_MAN_SUFFIX): fbdevhw.man
- -$(AM_V_at)rm -f fbdevhw.$(DRIVER_MAN_SUFFIX)
- $(AM_V_at)$(LN_S) fbdevhw.man fbdevhw.$(DRIVER_MAN_SUFFIX)
-
-EXTRA_DIST = fbpriv.h fbdevhw.man.pre README
+SUBDIRS = man + +module_LTLIBRARIES = libfbdevhw.la + +libfbdevhw_la_LDFLAGS = -avoid-version + +if FBDEVHW +libfbdevhw_la_SOURCES = fbdevhw.c +else +libfbdevhw_la_SOURCES = fbdevhwstub.c +endif + +INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c + +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) + +sdk_HEADERS = fbdevhw.h + +EXTRA_DIST = fbpriv.h README |