From da596daa0b1c6a6116b69cac100b4a7f04f61fcc Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 10 Nov 2008 20:03:46 +0100 Subject: [PATCH] enable VPATH build, reorganize app default files --- Makefile.am | 19 ++------ app-defaults/XSm | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++ app-defaults/XSm.ad | 119 --------------------------------------------------- 3 files changed, 124 insertions(+), 133 deletions(-) create mode 100644 app-defaults/XSm delete mode 100644 app-defaults/XSm.ad diff --git a/Makefile.am b/Makefile.am index 8e157e0..f93a93b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,20 +66,13 @@ xsm_SOURCES = \ appman_PRE = \ xsm.man -# App default files (*.ad) +# App default files appdefaultdir = @appdefaultdir@ - -APPDEFAULTFILES = \ +dist_appdefault_DATA = \ app-defaults/XSm -SUFFIXES = .ad - -.ad: - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) # system init file @@ -89,9 +82,7 @@ systeminit_DATA = system.xsm # -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) globals.c system.xsm - -CLEANFILES = $(APPDEFAULTFILES) +EXTRA_DIST = globals.c system.xsm appmandir = $(APP_MAN_DIR) @@ -99,7 +90,7 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) +CLEANFILES = $(appman_DATA) SED = sed @@ -120,7 +111,7 @@ MAN_SUBSTS = \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -SUFFIXES += .$(APP_MAN_SUFFIX) .man +SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ diff --git a/app-defaults/XSm b/app-defaults/XSm new file mode 100644 index 0000000..5129722 --- /dev/null +++ b/app-defaults/XSm @@ -0,0 +1,119 @@ +! $Xorg: XSm.ad,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ +*chooseSessionPopup*font: 12x24 +*chooseSessionLabel.label: Session Menu +*chooseSessionMessageLabel.label: Press button again to confirm, or hit Cancel... +*chooseSessionLoadButton.label: Load Session +*chooseSessionDeleteButton.label: Delete Session +*chooseSessionFailSafeButton.label: Default/Fail Safe +*chooseSessionCancelButton.label: Cancel +*chooseSessionBreakLockButton.label: Break Lock +*chooseSessionLoadButton.background: light steel blue +*chooseSessionDeleteButton.background: light steel blue +*chooseSessionBreakLockButton.background: light steel blue + +*chooseSessionFailSafeButton.background:light steel blue +*chooseSessionCancelButton.background: light steel blue + +*clientInfoButton.label: Client List +*logButton.label: Session Log +*checkPointButton.label: Checkpoint +*shutdownButton.label: Shutdown +*shutdownSave.label: With Checkpoint +*shutdownDontSave.label: Immediately + +*logPopup.title: Session Log +*logPopup.iconName: Session Log +*logOkButton.label: OK +*logText.width: 600 +*logText.height: 300 + +*clientInfoPopup.title: Client List +*clientInfoPopup.iconName: Client List +*noClientsLabel.label: There are no clients in the session +*viewPropButton.label: View Properties +*cloneButton.label: Clone +*killClientButton.label: Kill +*restartHintButton.label: Restart Hint +*restartIfRunning.label: If Running +*restartAnyway.label: Anyway +*restartImmediately.label: Immediately +*restartNever.label: Never + +*clientInfoDoneButton.label: Done +*manualRestartLabel.label: Restart the following non-session-aware clients... + +*clientPropTextWidget.width: 500 +*clientPropTextWidget.height: 300 +*clientPropDoneButton.label: Done + +*saveMessageLabel.label: Session name + +*saveTypeLabel.label: Save Type +*saveTypeNone.label: None +*saveTypeLocal.label: Local +*saveTypeGlobal.label: Global +*saveTypeBoth.label: Both + +*interactStyleLabel.label: Interact Style +*interactStyleNone.label: None +*interactStyleErrors.label: Errors +*interactStyleAny.label: Any + +*saveCancelButton.label: Cancel + +*helpSaveButton.label: Help +*helpSaveOkButton.label: OK + +*helpSaveText.label:\n\ +Save types\n\ +----------\n\ +Local - Applications should save enough information to\n\ + restore the state as seen by the user.\n\ + The save should not affect data seen by other users.\n\ +\n\ +Global - Applications should commit all of their data to\n\ + permanent, globally accessible storage.\n\ +\n\ +Both - Applications should commit their data to global\n\ + storage and also save state local to the user.\n\ +\n\n\ +Interaction styles\n\ +------------------\n\ +None - Don't allow user interaction\n\ +Errors - Allow user interaction only if an error occurs\n\ +Any - Allow user interaction for any reason\n\ +\n + +*nameInUsePopup.title: Warning +*nameInUseOverwriteButton.label: Overwrite + +*badSavePopup.title: Save Failure +*badSaveLabel.label: The following applications did not report\n\ +a successful save of their state: +*badSaveOkButton.label: OK +*badSaveCancelButton.label: Cancel Shutdown + +*chooseSessionListWidget.Translations: #override\n\ + Up: ChooseSessionUp()\n\ + KP_Up: ChooseSessionUp()\n\ + CtrlP: ChooseSessionUp()\n\ + Down: ChooseSessionDown()\n\ + KP_Down: ChooseSessionDown()\n\ + CtrlN: ChooseSessionDown()\n\ + : Set() ChooseSessionBtn1Down()\n + +*chooseSessionLoadButton.Accelerators: #override\n\ + (2+): set() notify() unset()\n\ + Return: set() notify() unset()\n\ + KP_Enter: set() notify() unset()\n + +*checkPointButton.Translations: #override\n\ + : notify() reset()\n +*shutdownButton.Translations: #override\n\ + : notify() reset()\n + +*saveOkButton.Accelerators: #override\n\ + Return: set() notify() unset()\n + +*badSaveOkButton.Accelerators: #override\n\ + Return: set() notify() unset()\n diff --git a/app-defaults/XSm.ad b/app-defaults/XSm.ad deleted file mode 100644 index 5129722..0000000 --- a/app-defaults/XSm.ad +++ /dev/null @@ -1,119 +0,0 @@ -! $Xorg: XSm.ad,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ -*chooseSessionPopup*font: 12x24 -*chooseSessionLabel.label: Session Menu -*chooseSessionMessageLabel.label: Press button again to confirm, or hit Cancel... -*chooseSessionLoadButton.label: Load Session -*chooseSessionDeleteButton.label: Delete Session -*chooseSessionFailSafeButton.label: Default/Fail Safe -*chooseSessionCancelButton.label: Cancel -*chooseSessionBreakLockButton.label: Break Lock -*chooseSessionLoadButton.background: light steel blue -*chooseSessionDeleteButton.background: light steel blue -*chooseSessionBreakLockButton.background: light steel blue - -*chooseSessionFailSafeButton.background:light steel blue -*chooseSessionCancelButton.background: light steel blue - -*clientInfoButton.label: Client List -*logButton.label: Session Log -*checkPointButton.label: Checkpoint -*shutdownButton.label: Shutdown -*shutdownSave.label: With Checkpoint -*shutdownDontSave.label: Immediately - -*logPopup.title: Session Log -*logPopup.iconName: Session Log -*logOkButton.label: OK -*logText.width: 600 -*logText.height: 300 - -*clientInfoPopup.title: Client List -*clientInfoPopup.iconName: Client List -*noClientsLabel.label: There are no clients in the session -*viewPropButton.label: View Properties -*cloneButton.label: Clone -*killClientButton.label: Kill -*restartHintButton.label: Restart Hint -*restartIfRunning.label: If Running -*restartAnyway.label: Anyway -*restartImmediately.label: Immediately -*restartNever.label: Never - -*clientInfoDoneButton.label: Done -*manualRestartLabel.label: Restart the following non-session-aware clients... - -*clientPropTextWidget.width: 500 -*clientPropTextWidget.height: 300 -*clientPropDoneButton.label: Done - -*saveMessageLabel.label: Session name - -*saveTypeLabel.label: Save Type -*saveTypeNone.label: None -*saveTypeLocal.label: Local -*saveTypeGlobal.label: Global -*saveTypeBoth.label: Both - -*interactStyleLabel.label: Interact Style -*interactStyleNone.label: None -*interactStyleErrors.label: Errors -*interactStyleAny.label: Any - -*saveCancelButton.label: Cancel - -*helpSaveButton.label: Help -*helpSaveOkButton.label: OK - -*helpSaveText.label:\n\ -Save types\n\ -----------\n\ -Local - Applications should save enough information to\n\ - restore the state as seen by the user.\n\ - The save should not affect data seen by other users.\n\ -\n\ -Global - Applications should commit all of their data to\n\ - permanent, globally accessible storage.\n\ -\n\ -Both - Applications should commit their data to global\n\ - storage and also save state local to the user.\n\ -\n\n\ -Interaction styles\n\ -------------------\n\ -None - Don't allow user interaction\n\ -Errors - Allow user interaction only if an error occurs\n\ -Any - Allow user interaction for any reason\n\ -\n - -*nameInUsePopup.title: Warning -*nameInUseOverwriteButton.label: Overwrite - -*badSavePopup.title: Save Failure -*badSaveLabel.label: The following applications did not report\n\ -a successful save of their state: -*badSaveOkButton.label: OK -*badSaveCancelButton.label: Cancel Shutdown - -*chooseSessionListWidget.Translations: #override\n\ - Up: ChooseSessionUp()\n\ - KP_Up: ChooseSessionUp()\n\ - CtrlP: ChooseSessionUp()\n\ - Down: ChooseSessionDown()\n\ - KP_Down: ChooseSessionDown()\n\ - CtrlN: ChooseSessionDown()\n\ - : Set() ChooseSessionBtn1Down()\n - -*chooseSessionLoadButton.Accelerators: #override\n\ - (2+): set() notify() unset()\n\ - Return: set() notify() unset()\n\ - KP_Enter: set() notify() unset()\n - -*checkPointButton.Translations: #override\n\ - : notify() reset()\n -*shutdownButton.Translations: #override\n\ - : notify() reset()\n - -*saveOkButton.Accelerators: #override\n\ - Return: set() notify() unset()\n - -*badSaveOkButton.Accelerators: #override\n\ - Return: set() notify() unset()\n -- 1.6.0.3