frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10

This commit is contained in:
Alan Coopersmith 2007-07-12 13:00:32 -07:00
parent 7c0ca27f6d
commit 9fcb30ebf7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/Makefile.am
View File

@ -78,10 +78,10 @@ if SOLARIS_ASM_INLINE
# Needs to be built before any files are compiled when using Sun compilers # Needs to be built before any files are compiled when using Sun compilers
# so in*/out* inline definitions are properly processed. # so in*/out* inline definitions are properly processed.
BUILT_SOURCES += os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il BUILT_SOURCES += os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il
os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il: os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il:
cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il cd os-support/solaris ; make solaris-@SOLARIS_INOUT_ARCH@.il
endif endif
# do not use $(mkdir_p) if you want automake 1.7 to work # do not use $(mkdir_p) if you want automake 1.7 to work

10
hw/xfree86/os-support/solaris/Makefile.am
View File

@ -11,11 +11,11 @@ AGP_SRC = sun_agp.c
#AGP_SRC = $(srcdir)/../shared/agp_noop.c #AGP_SRC = $(srcdir)/../shared/agp_noop.c
#endif #endif
SOLARIS_INOUT_SRC = solaris-$(SOLARIS_INOUT_ARCH).S SOLARIS_INOUT_SRC = solaris-@SOLARIS_INOUT_ARCH@.S
DISTCLEANFILES = solaris-$(SOLARIS_INOUT_ARCH).il DISTCLEANFILES = solaris-@SOLARIS_INOUT_ARCH@.il
solaris-$(SOLARIS_INOUT_ARCH).il: solaris-${SOLARIS_INOUT_ARCH}.S solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S
$(CPP) -P -DINLINE_ASM solaris-${SOLARIS_INOUT_ARCH}.S > $@ $(CPP) -P -DINLINE_ASM solaris-@SOLARIS_INOUT_ARCH@.S > $@
noinst_LTLIBRARIES = libsolaris.la noinst_LTLIBRARIES = libsolaris.la
libsolaris_la_SOURCES = sun_bios.c sun_init.c \ libsolaris_la_SOURCES = sun_bios.c sun_init.c \
@ -28,7 +28,7 @@ libsolaris_la_SOURCES = sun_bios.c sun_init.c \
nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
sdk_HEADERS = agpgart.h sdk_HEADERS = agpgart.h
nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il nodist_sdk_HEADERS = solaris-@SOLARIS_INOUT_ARCH@.il
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS) AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)