Changeset 573bcd0e8c35d52b0dda27d4267817f74b242cbf

Timestamp:

02/24/07 16:12:04 (6 years ago)

Author:

dsmith <dsmith@…>

Children:

e0b6f65e707207cdef250393e790fdb9015f0dd4

Parents:

d28407e15bda0300a283b3d508ed3745a9ad6cd4

git-author:

L. Donnie Smith <donnie.smith@…> (02/24/07 16:12:04)

git-committer:

dsmith <dsmith@…> (02/24/07 16:12:04)

Message:

Config, plugins directories location and uninstall

git-svn-id: http://abstrakraft.org/cwiid/svn/cwiid/trunk@8 918edb2d-ff29-0410-9de2-eb38e7f22bc7

Files:

• Makefile.in (modified) (3 diffs)
• README (modified) (2 diffs)
• common/include/defs.mak.in (modified) (2 diffs)
• configure (modified) (5 diffs)
• configure.ac (modified) (1 diff)
• wminput/Makefile.in (modified) (3 diffs)
• wminput/main.c (modified) (3 diffs)
• wminput/plugins/Makefile.in (modified) (1 diff)
• wminput/plugins/acc/Makefile.in (modified) (1 diff)
• wminput/plugins/ir_ptr/Makefile.in (modified) (1 diff)
• wminput/plugins/nunchuk_acc/Makefile.in (modified) (1 diff)

Makefile.in

@@ -20 +20 @@
 
 ifeq ($(MAKECMDGOALS),install)
-$(BIN_DIRS) $(LIB_DIRS): $(GLOBAL_CWIID_DIR)
+$(BIN_DIRS) $(LIB_DIRS): $(CWIID_CONFIG_DIR) $(CWIID_PLUGINS_DIR)
 endif
 
@@ -26 +26 @@
         $(MAKE) $(TARGET) -C $@
 
-$(GLOBAL_CWIID_DIR):
-        mkdir -p $(GLOBAL_CWIID_DIR)
+$(CWIID_CONFIG_DIR):
+        mkdir -p $(CWIID_CONFIG_DIR)
+
+$(CWIID_PLUGINS_DIR):
+        mkdir -p $(CWIID_PLUGINS_DIR)
 
 distclean:
@@ -33 +36 @@
 
 uninstall:
-        rm -rf $(GLOBAL_CWIID_DIR); true
+        rm -r $(CWIID_PLUGINS_DIR); true
 
-.PHONY: all install clean distclean uninstall $(LIB_DIRS) $(BIN_DIRS) wmdemo
+uninstall_config:
+        rm -rf $(CWIID_CONFIG_DIR)
+
+.PHONY: all install clean distclean uninstall uninstall_config $(LIB_DIRS) \
+        $(BIN_DIRS) wmdemo

README

@@ -38 +38 @@
 sudo make install
 
+While CWiid is still in the early development stages, installation directories and filenames are changed more often than in a mature, stable package.  In order to prevent the collection of obselete directories and files, it is recommended that you run 'make uninstall && make uninstall_config' from your current CWiid source directory before installing a new one.
+
 Many distributions do not have /usr/local/lib in the library search path, and on many of these same distributions, the library installation directory (as determined by autoconf) is /usr/local/lib, creating a problem when you try to run programs depending on libraries installed there. There are two clean ways to fix this:
 1.Add a --prefix=/usr argument to ./configure
@@ -56 +58 @@
 See wminput/README for more information on wminput configuration and execution.
 
-TODO/ROADMAP
+FUTURE IDEAS/IMPROVEMENTS
 ------------------------------------------------------------------------------------------------
 The following list is neither complete nor ordered:

common/include/defs.mak.in

@@ -4 +4 @@
 exec_prefix = @exec_prefix@
 
-datarootdir = @datarootdir@
-datadir = @datadir@
+sysconfdir = @sysconfdir@
+libdir = @libdir@
 
 CC = @CC@
@@ -12 +12 @@
 YACC = @YACC@
 
-GLOBAL_CWIID_DIR = $(datadir)/CWiid
+CWIID_CONFIG_DIR = @CWIID_CONFIG_DIR@
+CWIID_PLUGINS_DIR = @CWIID_PLUGINS_DIR@
 
-CFLAGS = -g -Wall -DGLOBAL_CWIID_DIR=\"$(GLOBAL_CWIID_DIR)\" \
-        -DCWIID_VERSION=\"@PACKAGE_VERSION@\"
+CFLAGS = -g -Wall -DCWIID_VERSION=\"@PACKAGE_VERSION@\" \
+        -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\" \
+        -DCWIID_CONFIG_DIR=\"$(CWIID_CONFIG_DIR)\"
 

configure

@@ -668 +668 @@
 GREP
 EGREP
+CWIID_CONFIG_DIR
+CWIID_PLUGINS_DIR
 PKG_CONFIG
 PACKAGE_CFLAGS
@@ -1254 +1256 @@
    esac
   cat <<\_ACEOF
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-cwiid-config-dir CWiid configuration directory, default to
+                          $(sysconfdir)/cwiid
+  --with-cwiid-plugins-dir
+                          CWiid plugins directory, default to
+                          $(libdir)/cwiid/plugins
 
 Some influential environment variables:
@@ -4267 +4278 @@
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+fi
+
+
+
+# Check whether --with-cwiid-config-dir was given.
+if test "${with_cwiid_config_dir+set}" = set; then
+  withval=$with_cwiid_config_dir;
+fi
+
+if test -z $with_cwiid_config_dir; then
+        CWIID_CONFIG_DIR='${sysconfdir}/cwiid'
+else
+        CWIID_CONFIG_DIR=$with_cwiid_config_dir
+fi
+
+
+
+# Check whether --with-cwiid-plugins-dir was given.
+if test "${with_cwiid_plugins_dir+set}" = set; then
+  withval=$with_cwiid_plugins_dir;
+fi
+
+if test -n $with_cwiid_plugins_dir; then
+        CWIID_PLUGINS_DIR='${libdir}/cwiid/plugins'
+else
+        CWIID_PLUGINS_DIR=$with_cwiid_plugins_dir
 fi
 
@@ -5197 +5234 @@
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
+CWIID_CONFIG_DIR!$CWIID_CONFIG_DIR$ac_delim
+CWIID_PLUGINS_DIR!$CWIID_PLUGINS_DIR$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 PACKAGE_CFLAGS!$PACKAGE_CFLAGS$ac_delim
@@ -5204 +5243 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
     break
   elif $ac_last_try; then

configure.ac

@@ -35 +35 @@
 AC_ISC_POSIX
 
+AC_ARG_WITH(cwiid-config-dir,AC_HELP_STRING([--with-cwiid-config-dir],
+        [CWiid configuration directory, default to $(sysconfdir)/cwiid]))
+if test -z $with_cwiid_config_dir; then
+        CWIID_CONFIG_DIR='${sysconfdir}/cwiid'
+else
+        CWIID_CONFIG_DIR=$with_cwiid_config_dir
+fi
+AC_SUBST(CWIID_CONFIG_DIR)
+
+AC_ARG_WITH(cwiid-plugins-dir,AC_HELP_STRING([--with-cwiid-plugins-dir],
+        [CWiid plugins directory, default to $(libdir)/cwiid/plugins]))
+if test -n $with_cwiid_plugins_dir; then
+        CWIID_PLUGINS_DIR='${libdir}/cwiid/plugins'
+else
+        CWIID_PLUGINS_DIR=$with_cwiid_plugins_dir
+fi
+AC_SUBST(CWIID_PLUGINS_DIR)
+
 pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])

wminput/Makefile.in

@@ -8 +8 @@
 SOURCES = main.c conf.c uinput.c action_enum.c parser.c lexer.c util.c
 
-CFLAGS += -I@top_builddir@/wiimote
+CFLAGS += -I@top_builddir@/wiimote \
+        -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\"
 LDLIBS = -lwiimote -ldl
 LDFLAGS = -L@top_builddir@/wiimote -rdynamic
 INST_DIR = @bindir@
+WMINPUT_CONFIG_DIR = $(CWIID_CONFIG_DIR)/wminput
 
 YFLAGS = -d
@@ -21 +23 @@
 install: install_configs
 
-uninstall: uninstall_configs
+#DON'T UNINSTALL CONFIGS
+#uninstall: uninstall_configs
 
 make_plugins:
@@ -27 +30 @@
 
 install_configs:
-        mkdir -p $(GLOBAL_CWIID_DIR)/wminput
-        cp configs/* $(GLOBAL_CWIID_DIR)/wminput
-        ln -sf $(GLOBAL_CWIID_DIR)/wminput/acc_ptr \
-                $(GLOBAL_CWIID_DIR)/wminput/default
+        mkdir -p $(WMINPUT_CONFIG_DIR)
+        cp configs/* $(WMINPUT_CONFIG_DIR)
+        ln -sf $(WMINPUT_CONFIG_DIR)/acc_ptr \
+                $(WMINPUT_CONFIG_DIR)/default
 
-uninstall_configs:
-        rm -f $(GLOBAL_CWIID_DIR)/wminput/default
-        for c in `ls configs`; do                                       \
-                rm -f $(GLOBAL_CWIID_DIR)/wminput/$$c;  \
-        done
-        rmdir $(GLOBAL_CWIID_DIR)/wminput; true
+#uninstall_configs:
+#       rm -f $(WMINPUT_CONFIG_DIR)/default
+#       for c in `ls configs`; do                               \
+#               rm -f $(WMINPUT_CONFIG_DIR)/$$c;        \
+#       done
+#       rmdir $(WMINPUT_CONFIG_DIR); true
 
 action_enum.c: action_enum.awk action_enum.txt

wminput/main.c

@@ -48 +48 @@
 int init;
 
-#ifndef GLOBAL_CWIID_DIR
-#error Global plugin directory macro undefined
-#endif
-
 #define DEFAULT_CONFIG_FILE     "default"
 
 #define USAGE "usage:%s [-h] [-c config] [bdaddr]\n"
-
-#define GLOBAL_CONFIG_DIR       GLOBAL_CWIID_DIR "/wminput"
-#define GLOBAL_PLUGIN_DIR       GLOBAL_CWIID_DIR "/plugins"
 
 #define HOME_DIR_LEN    128
@@ -97 +90 @@
         if ((tmp = getenv("HOME")) == NULL) {
                 wminput_err("unable to find home directory");
-                config_search_dirs[0] = GLOBAL_CONFIG_DIR;
-                plugin_search_dirs[0] = GLOBAL_PLUGIN_DIR;
+                config_search_dirs[0] = WMINPUT_CONFIG_DIR;
+                plugin_search_dirs[0] = CWIID_PLUGINS_DIR;
                 config_search_dirs[1] = plugin_search_dirs[1] = NULL;
         }
@@ -106 +99 @@
                 config_search_dirs[0] = home_config_dir;
                 plugin_search_dirs[0] = home_plugin_dir;
-                config_search_dirs[1] = GLOBAL_CONFIG_DIR;
-                plugin_search_dirs[1] = GLOBAL_PLUGIN_DIR;
+                config_search_dirs[1] = WMINPUT_CONFIG_DIR;
+                plugin_search_dirs[1] = CWIID_PLUGINS_DIR;
                 config_search_dirs[2] = plugin_search_dirs[2] = NULL;
         }

wminput/plugins/Makefile.in

@@ -13 +13 @@
         $(MAKE) $(TARGET) -C $@
 
-ifeq  ($(MAKECMDGOALS), install)
-$(PLUGINS): $(GLOBAL_CWIID_DIR)/plugins
-endif
-
-$(GLOBAL_CWIID_DIR)/plugins:
-        mkdir -p $(GLOBAL_CWIID_DIR)/plugins
-
 distclean: clean
         rm Makefile
 
-uninstall: $(PLUGINS)
-        rmdir $(GLOBAL_CWIID_DIR)/plugins; true
-
 .PHONY: all install clean distclean uninstall $(PLUGINS)

wminput/plugins/acc/Makefile.in

@@ -8 +8 @@
 CFLAGS += -I@top_builddir@/wminput -I@top_builddir@/wiimote
 LDLIBS = -lm
-INST_DIR = $(GLOBAL_CWIID_DIR)/plugins
+INST_DIR = $(CWIID_PLUGINS_DIR)
 
 include $(COMMON)/include/plugin.mak

wminput/plugins/ir_ptr/Makefile.in

@@ -7 +7 @@
 SOURCES = ir_ptr.c
 CFLAGS += -I@top_builddir@/wminput -I@top_builddir@/wiimote
-INST_DIR = $(GLOBAL_CWIID_DIR)/plugins
+INST_DIR = $(CWIID_PLUGINS_DIR)
 
 include $(COMMON)/include/plugin.mak

wminput/plugins/nunchuk_acc/Makefile.in

@@ -8 +8 @@
 CFLAGS += -I@top_builddir@/wminput -I@top_builddir@/wiimote
 LDLIBS = -lm
-INST_DIR = $(GLOBAL_CWIID_DIR)/plugins
+INST_DIR = $(CWIID_PLUGINS_DIR)
 
 include $(COMMON)/include/plugin.mak