From 947e73db3b46f46c891b52c7beda3c4e59612064 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 25 Jul 2009 09:01:10 +0000 Subject: Update makefile for removing old xkbdata stuff --- xorg-server/xkbdata.src/rules/makefile | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'xorg-server/xkbdata.src/rules') diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile index f808aad64..06a6d15c5 100644 --- a/xorg-server/xkbdata.src/rules/makefile +++ b/xorg-server/xkbdata.src/rules/makefile @@ -124,29 +124,25 @@ RULES_FILES = base evdev xfree98 LST_FILES = base.lst evdev.lst -%.lst: %.xml +$(DESTDIR)\%.lst: $(DESTDIR)\%.xml perl xml2lst.pl < $< > $@ -base: $(BASE_PARTS_NO_COMPAT) +$(DESTDIR)\base: $(BASE_PARTS_NO_COMPAT) merge $@ $(BASE_PARTS) -evdev: $(EVDEV_PARTS_NO_COMPAT) +$(DESTDIR)\evdev: $(EVDEV_PARTS_NO_COMPAT) merge $@ $(EVDEV_PARTS) ALL_RULES_FILES = $(RULES_FILES) $(LST_FILES) \ -xkb.dtd README \ - sgi \ - sgi.lst \ - sun \ - sun.lst \ - xfree98 \ - xfree98.lst \ - xorg \ - xorg-it.lst \ - xorg.lst \ - xorg.xml - -rules_DATA = $(ALL_RULES_FILES) +xkb.dtd README + +COMPATFILES=xorg xorg.xml xorg.lst +$(DESTDIR)\xorg: $(DESTDIR)\base + copy $< $@ +$(DESTDIR)\xorg%: $(DESTDIR)\base% + copy $< $@ + +rules_DATA = $(ALL_RULES_FILES) $(COMPATFILES) XML_IN_FILES = base.xml.in evdev.xml.in xml_DATA = $(XML_IN_FILES:%.xml.in=%.xml) -- cgit v1.2.3