diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-10-31 14:00:15 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-10-31 14:00:15 +0000 |
| commit | aff0c2e23d1844c1376768334b9e089fefbe9389 (patch) | |
| tree | 145280e4ea39e3f9cd8288592d3b340768fa1361 /app/xinit/Makefile.am | |
| parent | abafddd49ea3a71cf0bc0fb49d674fbf52da55d1 (diff) | |
Update to xinit 1.3.1
Diffstat (limited to 'app/xinit/Makefile.am')
| -rw-r--r-- | app/xinit/Makefile.am | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/app/xinit/Makefile.am b/app/xinit/Makefile.am index d0eac0796..7329b596c 100644 --- a/app/xinit/Makefile.am +++ b/app/xinit/Makefile.am @@ -19,6 +19,11 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man +if LAUNCHD +SUBDIRS += launchd +endif + bin_PROGRAMS = xinit bin_SCRIPTS = startx @@ -29,14 +34,6 @@ xinit_LDADD = $(XINIT_LIBS) xinit_SOURCES = \ xinit.c -appmandir = $(APP_MAN_DIR) - -appman_PRE = \ - startx.man \ - xinit.man - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - include $(top_srcdir)/cpprules.in xinitrcdir = $(XINITDIR) @@ -58,26 +55,14 @@ CPP_FILES_FLAGS = \ -DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \ -D__libexecdir__="$(libexecdir)" \ -D__bindir__="$(bindir)" \ - -DLAUNCHD_ID_PREFIX="$(launchdidprefix)" - -if LAUNCHD -$(launchdidprefix).startx.plist.cpp: org.x.startx.plist.cpp - cp $< $@ - -launchagents_PRE = $(launchdidprefix).startx.plist.cpp -launchagents_DATA = $(launchagents_PRE:plist.cpp=plist) - -SUBDIRS = privileged_startx -endif - -DIST_SUBDIRS = privileged_startx + -DBUNDLE_ID_PREFIX="$(bundleidprefix)" xinitrc_DATA = xinitrc MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = xinitrc startx $(appman_DATA) $(launchagents_DATA) +CLEANFILES = xinitrc startx $(launchagents_DATA) -EXTRA_DIST = xinitrc.cpp startx.cpp org.x.startx.plist.cpp $(appman_PRE) \ +EXTRA_DIST = xinitrc.cpp startx.cpp \ autogen.sh .PHONY: ChangeLog INSTALL |