summaryrefslogtreecommitdiff
path: root/config/Makefile.am
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2016-11-11 15:25:18 +0000
committerMatthieu Herrb <matthieu@herrb.eu>2020-07-14 15:52:36 +0200
commit9474484862f9a3b54b3b795cf4a18db8e0d5be58 (patch)
tree2bbd1a2ae8bdc166f8880e02930e46577a13df9c /config/Makefile.am
parente899fa69c3d6d792b2b231033724fe12fe07ccf9 (diff)
Keep only on Xservers file. The Xservers.fs file makes no sense in xenodm.
Diffstat (limited to 'config/Makefile.am')
-rw-r--r--config/Makefile.am11
1 files changed, 4 insertions, 7 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index 21c32d9..88f391d 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -25,16 +25,13 @@ pixmapdir = $(XENODM_PIXMAPDIR)
dist_pixmap_DATA = OpenBSD_15bpp.xpm OpenBSD_1bpp.xpm \
OpenBSD_4bpp.xpm OpenBSD_8bpp.xpm
-BUILT_SOURCES = Xservers.ws xenodm-config Xreset Xresources Xsession Xstartup
+BUILT_SOURCES = Xservers xenodm-config Xreset Xresources Xsession Xstartup
CLEANFILES = $(BUILT_SOURCES) Xservers
-EXTRA_DIST = Xservers.ws.cpp Xservers.fs \
+EXTRA_DIST = Xservers.cpp \
xenodm-config.cpp Xreset.cpp Xresources.cpp Xsession.cpp Xstartup.cpp
-Xservers: Xservers.$(SERVERSTYPE)
- ln -s Xservers.$(SERVERSTYPE) Xservers
-
# Defines used when cpp'ing config files to replace settings in the files
#if USE_XPM
@@ -54,5 +51,5 @@ CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
-DXENODMSCRIPTDIR="$(XENODMSCRIPTDIR)" -DSU="$(SU)" \
$(XPMDEFINES) -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
-Xservers.ws: $(srcdir)/Xservers.ws.cpp
- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@
+Xservers: $(srcdir)/Xservers.cpp
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.cpp | $(CPP_SED_MAGIC) > $@