aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-07 06:44:01 +0000
committermarha <marha@users.sourceforge.net>2009-09-07 06:44:01 +0000
commit1f9b2920414edf2fb4db0e6285cf13e434bb1888 (patch)
tree4a4e6e3273b23579c8accc7f0e5190e955cc928f
parent0a65ff8ed074c79c613c08f4bb2ca87f4a9e62b8 (diff)
downloadvcxsrv-1f9b2920414edf2fb4db0e6285cf13e434bb1888.tar.gz
vcxsrv-1f9b2920414edf2fb4db0e6285cf13e434bb1888.tar.bz2
vcxsrv-1f9b2920414edf2fb4db0e6285cf13e434bb1888.zip
Moved .PHONY rule for extrastuff to xkbrules.mak
-rw-r--r--xorg-server/xkbdata.src/geometry/makefile2
-rw-r--r--xorg-server/xkbdata.src/keycodes/makefile2
-rw-r--r--xorg-server/xkbdata.src/keymap/makefile2
-rw-r--r--xorg-server/xkbdata.src/xkbrules.mak2
4 files changed, 2 insertions, 6 deletions
diff --git a/xorg-server/xkbdata.src/geometry/makefile b/xorg-server/xkbdata.src/geometry/makefile
index e4351158f..a0664ee89 100644
--- a/xorg-server/xkbdata.src/geometry/makefile
+++ b/xorg-server/xkbdata.src/geometry/makefile
@@ -20,8 +20,6 @@ SUBDIRS = digital_vndr sgi_vndr
load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
-.PHONY: extrastuff
-
extrastuff: $(SUBDIRS:%=%\all)
include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keycodes/makefile b/xorg-server/xkbdata.src/keycodes/makefile
index 4b127c396..cdc1dde71 100644
--- a/xorg-server/xkbdata.src/keycodes/makefile
+++ b/xorg-server/xkbdata.src/keycodes/makefile
@@ -27,8 +27,6 @@ DATA_FILES=$(dist_xkbdata_keycodes_DATA:%=$(DESTDIR)\%)
load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
-.PHONY: extrastuff
-
extrastuff: $(SUBDIRS:%=%\all)
include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/makefile b/xorg-server/xkbdata.src/keymap/makefile
index 5e174d61e..1b549a08f 100644
--- a/xorg-server/xkbdata.src/keymap/makefile
+++ b/xorg-server/xkbdata.src/keymap/makefile
@@ -17,8 +17,6 @@ DATA_FILES=$(dist_xkbdata_keymap_DATA:%=$(DESTDIR)\%)
load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
-.PHONY: extrastuff
-
extrastuff: $(SUBDIRS:%=%\all)
include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/xkbrules.mak b/xorg-server/xkbdata.src/xkbrules.mak
index e13c0a28b..67a0e55e7 100644
--- a/xorg-server/xkbdata.src/xkbrules.mak
+++ b/xorg-server/xkbdata.src/xkbrules.mak
@@ -8,6 +8,8 @@ $(DESTDIR)\%: %
copy $< $@
ifneq ($(DIRFILE),)
+.PHONY: extrastuff
+
$(DIRFILE): extrastuff $(DATA_FILES)
-del -e $@
cd $(DESTDIR) & ..\..\xkbcomp.exe -lfhlpR -o $(relpath $@) *