diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | hw/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/dmx/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/vfb/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/xnest/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/xwin/Makefile.am | 3 |
8 files changed, 27 insertions, 0 deletions
@@ -4,6 +4,11 @@ Nuke unsupported NDBM routines. Shrink the hash table a bit, over 25% of the buckets were going empty. + * Makefile.am: + * hw/Makefile.am: + * hw/*/Makefile.am: + Bug #4190: Add a rule for 'make relink' since automake sucks. + 2005-12-26 Daniel Stone <daniel@freedesktop.org> * xkb/xkbInit.c: diff --git a/Makefile.am b/Makefile.am index 516bad49e..0688484e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,3 +110,7 @@ DIST_SUBDIRS = \ Xprint \ XpConfig \ lbx + +# gross hack +relink: all + $(MAKE) -C hw relink diff --git a/hw/Makefile.am b/hw/Makefile.am index 054d7b8ba..97f92124f 100644 --- a/hw/Makefile.am +++ b/hw/Makefile.am @@ -28,3 +28,6 @@ SUBDIRS = \ $(DMX_SUBDIRS) DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin + +relink: + for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 7cb852154..dc5323203 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -106,3 +106,6 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man sed $(MAN_SUBSTS) < $< > $@ EXTRA_DIST = $(appman_PRE) + +relink: + rm -f Xdmx && $(MAKE) Xdmx diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index dce0d49e1..bd87d1d4b 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -42,3 +42,6 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man $(LN_S) $< $@ EXTRA_DIST = Xvfb.man.pre + +relink: + rm -f Xvfb && $(MAKE) Xvfb diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index e4f1a3877..1597004c9 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -72,3 +72,6 @@ optionsdir = $(libdir)/X11 dist_options_DATA = Options EXTRA_DIST = xorgconf.cpp + +relink: + rm -f Xorg && $(MAKE) Xorg diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index b822a94c0..76d0a57a5 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -86,3 +86,6 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): -rm -f $@ $(LN_S) $< $@ + +relink: + rm -f Xnest && $(MAKE) Xnest diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 65734e639..dbbcb0545 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -191,3 +191,6 @@ EXTRA_DIST = \ xlaunch/window/window.h \ xlaunch/window/wizard.cc \ xlaunch/window/wizard.h + +relink: + rm -f XWin && $(MAKE) XWin |