diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-08-23 07:07:57 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-08-23 07:07:57 +0000 |
| commit | 6bdf59b8f4fa96e5d85aafc87af57513794cb43e (patch) | |
| tree | 63f3917c10adc921829fa5060736eeffc7070488 /config | |
| parent | d778b237aab11cfa4ac8d50587f045d8a0497b9a (diff) | |
Actually generate Xservers.ws from .cpp, and make build objdir != srcdir
safe.
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 966d227..aaba13e 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -3,13 +3,14 @@ include $(top_srcdir)/cpprules.in -pkglib_DATA = \ +dist_pkglib_DATA = \ xdm-config \ Xresources \ - Xservers \ Xaccess -pkglib_SCRIPTS = \ +pkglib_DATA = Xservers + +dist_pkglib_SCRIPTS = \ Xsession \ GiveConsole \ TakeConsole \ @@ -20,15 +21,20 @@ pkglib_SCRIPTS = \ pixmapdir = $(pkglibdir)/pixmaps -pixmap_DATA = xorg-bw.xpm xorg.xpm +dist_pixmap_DATA = xorg-bw.xpm xorg.xpm BUILT_SOURCES = Xservers.ws CLEANFILES = $(BUILT_SOURCES) Xservers Xservers.ws xdm-config Xresources -Xservers: +EXTRA_DIST = Xservers.ws.cpp + +Xservers: Xservers.$(SERVERSTYPE) ln -s Xservers.$(SERVERSTYPE) Xservers +Xservers.ws: $(srcdir)/Xservers.ws.cpp + $(RAWCPP) -DBINDIR=@bindir@ -DSERVERNAME=7 < $< > $@ + # Defines used when cpp'ing config files to replace settings in the files #if USE_XPM @@ -38,4 +44,4 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIXMAPDIR) -DXDM_PIXMAP=$(XDM_PIXMAP) \ CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \ -DXDMDIR=$(pkglibdir) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \ - -DSU=$(SU) -DCHOOSERPATH=$(pkglibdir)/chooser $(XPMDEFINES)
\ No newline at end of file + -DSU=$(SU) -DCHOOSERPATH=$(pkglibdir)/chooser $(XPMDEFINES) |