diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-08-27 17:06:16 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-08-27 17:06:16 +0000 |
| commit | e0187570bd3efd7b61ccc41dbc21d0840ee82260 (patch) | |
| tree | 4c317fe1314da374e2d7c8f47e5a9aa448f75808 /config | |
| parent | 6bdf59b8f4fa96e5d85aafc87af57513794cb43e (diff) | |
Fixes for config files built via cpp
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index aaba13e..e66595f 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -4,11 +4,12 @@ include $(top_srcdir)/cpprules.in dist_pkglib_DATA = \ - xdm-config \ - Xresources \ Xaccess -pkglib_DATA = Xservers +pkglib_DATA = \ + xdm-config \ + Xresources \ + Xservers dist_pkglib_SCRIPTS = \ Xsession \ @@ -23,18 +24,15 @@ pixmapdir = $(pkglibdir)/pixmaps dist_pixmap_DATA = xorg-bw.xpm xorg.xpm -BUILT_SOURCES = Xservers.ws +BUILT_SOURCES = Xservers.ws xdm-config Xresources CLEANFILES = $(BUILT_SOURCES) Xservers Xservers.ws xdm-config Xresources -EXTRA_DIST = Xservers.ws.cpp +EXTRA_DIST = Xservers.ws.cpp xdm-config.cpp Xresources.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 @@ -45,3 +43,6 @@ 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) + +Xservers.ws: $(srcdir)/Xservers.ws.cpp + $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ |