diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | launchd/Makefile.am | 1 | ||||
| -rw-r--r-- | launchd/privileged_startx/.gitignore (renamed from privileged_startx/.gitignore) | 2 | ||||
| -rwxr-xr-x | launchd/privileged_startx/10-tmpdirs.cpp (renamed from privileged_startx/10-tmpdirs.cpp) | 0 | ||||
| -rwxr-xr-x | launchd/privileged_startx/20-font_cache.cpp (renamed from privileged_startx/20-font_cache.cpp) | 0 | ||||
| -rw-r--r-- | launchd/privileged_startx/Makefile.am (renamed from privileged_startx/Makefile.am) | 4 | ||||
| -rw-r--r-- | launchd/privileged_startx/client.c (renamed from privileged_startx/client.c) | 0 | ||||
| -rw-r--r-- | launchd/privileged_startx/privileged_startx.c (renamed from privileged_startx/privileged_startx.c) | 0 | ||||
| -rw-r--r-- | launchd/privileged_startx/privileged_startx.defs (renamed from privileged_startx/privileged_startx.defs) | 0 | ||||
| -rw-r--r-- | launchd/privileged_startx/privileged_startx.plist.cpp (renamed from privileged_startx/org.x.privileged_startx.plist.cpp) | 0 | ||||
| -rw-r--r-- | launchd/privileged_startx/privileged_startx_types.h (renamed from privileged_startx/privileged_startx_types.h) | 0 | ||||
| -rw-r--r-- | launchd/privileged_startx/server.c (renamed from privileged_startx/server.c) | 0 | ||||
| -rw-r--r-- | launchd/user_startx/.gitignore | 1 | ||||
| -rw-r--r-- | launchd/user_startx/Makefile.am | 39 | ||||
| -rw-r--r-- | launchd/user_startx/startx.plist.cpp (renamed from org.x.startx.plist.cpp) | 0 |
17 files changed, 50 insertions, 14 deletions
@@ -37,7 +37,6 @@ Makefile.in mdate-sh missing mkinstalldirs -*.startx.plist *.pc py-compile stamp-h? diff --git a/Makefile.am b/Makefile.am index 2b8a4eb..2ba7364 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,23 +59,17 @@ CPP_FILES_FLAGS = \ -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 +SUBDIRS = launchd endif -DIST_SUBDIRS = privileged_startx +DIST_SUBDIRS = launchd xinitrc_DATA = xinitrc MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = xinitrc startx $(appman_DATA) $(launchagents_DATA) -EXTRA_DIST = xinitrc.cpp startx.cpp org.x.startx.plist.cpp $(appman_PRE) \ +EXTRA_DIST = xinitrc.cpp startx.cpp $(appman_PRE) \ autogen.sh .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 67214cb..d9c795d 100644 --- a/configure.ac +++ b/configure.ac @@ -201,5 +201,7 @@ AC_SUBST(XINIT) AC_SUBST(XINITDIR) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([privileged_startx/Makefile]) +AC_CONFIG_FILES([launchd/Makefile]) +AC_CONFIG_FILES([launchd/privileged_startx/Makefile]) +AC_CONFIG_FILES([launchd/user_startx/Makefile]) AC_OUTPUT diff --git a/launchd/Makefile.am b/launchd/Makefile.am new file mode 100644 index 0000000..d6b5597 --- /dev/null +++ b/launchd/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = privileged_startx user_startx diff --git a/privileged_startx/.gitignore b/launchd/privileged_startx/.gitignore index 4bee5e8..c4a009d 100644 --- a/privileged_startx/.gitignore +++ b/launchd/privileged_startx/.gitignore @@ -1,6 +1,6 @@ 10-tmpdirs 20-font_cache -*.privileged_startx.plist +*.privileged_startx.plist* privileged_startx privileged_startx.h privileged_startxServer.c diff --git a/privileged_startx/10-tmpdirs.cpp b/launchd/privileged_startx/10-tmpdirs.cpp index e30abac..e30abac 100755 --- a/privileged_startx/10-tmpdirs.cpp +++ b/launchd/privileged_startx/10-tmpdirs.cpp diff --git a/privileged_startx/20-font_cache.cpp b/launchd/privileged_startx/20-font_cache.cpp index 6d43e10..6d43e10 100755 --- a/privileged_startx/20-font_cache.cpp +++ b/launchd/privileged_startx/20-font_cache.cpp diff --git a/privileged_startx/Makefile.am b/launchd/privileged_startx/Makefile.am index 453f6e7..92f2227 100644 --- a/privileged_startx/Makefile.am +++ b/launchd/privileged_startx/Makefile.am @@ -55,7 +55,7 @@ BUILT_SOURCES = \ privileged_startxServer.h \ privileged_startx.h -$(launchdidprefix).privileged_startx.plist.cpp: org.x.privileged_startx.plist.cpp +$(launchdidprefix).privileged_startx.plist.cpp: privileged_startx.plist.cpp cp $< $@ launchdaemons_PRE = $(launchdidprefix).privileged_startx.plist.cpp @@ -72,7 +72,7 @@ CLEANFILES = \ EXTRA_DIST = \ 10-tmpdirs.cpp \ 20-font_cache.cpp \ - org.x.privileged_startx.plist.cpp \ + privileged_startx.plist.cpp \ privileged_startx.defs \ privileged_startx_types.h diff --git a/privileged_startx/client.c b/launchd/privileged_startx/client.c index 8e1a771..8e1a771 100644 --- a/privileged_startx/client.c +++ b/launchd/privileged_startx/client.c diff --git a/privileged_startx/privileged_startx.c b/launchd/privileged_startx/privileged_startx.c index 725a1b0..725a1b0 100644 --- a/privileged_startx/privileged_startx.c +++ b/launchd/privileged_startx/privileged_startx.c diff --git a/privileged_startx/privileged_startx.defs b/launchd/privileged_startx/privileged_startx.defs index 86f2b3a..86f2b3a 100644 --- a/privileged_startx/privileged_startx.defs +++ b/launchd/privileged_startx/privileged_startx.defs diff --git a/privileged_startx/org.x.privileged_startx.plist.cpp b/launchd/privileged_startx/privileged_startx.plist.cpp index 02e1cce..02e1cce 100644 --- a/privileged_startx/org.x.privileged_startx.plist.cpp +++ b/launchd/privileged_startx/privileged_startx.plist.cpp diff --git a/privileged_startx/privileged_startx_types.h b/launchd/privileged_startx/privileged_startx_types.h index 8928e64..8928e64 100644 --- a/privileged_startx/privileged_startx_types.h +++ b/launchd/privileged_startx/privileged_startx_types.h diff --git a/privileged_startx/server.c b/launchd/privileged_startx/server.c index 4415943..4415943 100644 --- a/privileged_startx/server.c +++ b/launchd/privileged_startx/server.c diff --git a/launchd/user_startx/.gitignore b/launchd/user_startx/.gitignore new file mode 100644 index 0000000..60802d7 --- /dev/null +++ b/launchd/user_startx/.gitignore @@ -0,0 +1 @@ +*.startx.plist* diff --git a/launchd/user_startx/Makefile.am b/launchd/user_startx/Makefile.am new file mode 100644 index 0000000..9e4e4d9 --- /dev/null +++ b/launchd/user_startx/Makefile.am @@ -0,0 +1,39 @@ +# +# Copyright 2005 Red Hat, Inc. +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Red Hat not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Red Hat makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +include $(top_srcdir)/cpprules.in + +xinitrcdir = $(XINITDIR) + +CPP_FILES_FLAGS = \ + -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DLIBDIR=$(libdir) \ + -DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \ + -D__libexecdir__="$(libexecdir)" \ + -D__bindir__="$(bindir)" \ + -DLAUNCHD_ID_PREFIX="$(launchdidprefix)" + +$(launchdidprefix).startx.plist.cpp: startx.plist.cpp + cp $< $@ + +launchagents_PRE = $(launchdidprefix).startx.plist.cpp +launchagents_DATA = $(launchagents_PRE:plist.cpp=plist) + +EXTRA_DIST = startx.plist.cpp diff --git a/org.x.startx.plist.cpp b/launchd/user_startx/startx.plist.cpp index bd4c9e9..bd4c9e9 100644 --- a/org.x.startx.plist.cpp +++ b/launchd/user_startx/startx.plist.cpp |