diff options
Diffstat (limited to 'nxcompshad')
| -rw-r--r-- | nxcompshad/Logger.h | 4 | ||||
| -rw-r--r-- | nxcompshad/Makefile.in | 45 | ||||
| -rw-r--r-- | nxcompshad/Misc.h | 4 | ||||
| -rw-r--r-- | nxcompshad/configure.in | 6 |
4 files changed, 46 insertions, 13 deletions
diff --git a/nxcompshad/Logger.h b/nxcompshad/Logger.h index 94e4da857..2e6430b48 100644 --- a/nxcompshad/Logger.h +++ b/nxcompshad/Logger.h @@ -18,8 +18,8 @@ #ifndef Logger_H #define Logger_H -#include <errno.h> -#include <stdarg.h> +#include <cerrno> +#include <cstdarg> // // Error handling macros. diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 1580a3594..089a4f680 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -48,7 +48,7 @@ CCINCLUDES = CCDEFINES = LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 +LIBS = @LIBS@ -lNX_X11 # # Only if THREADS is defined. @@ -74,10 +74,17 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ man1dir = @mandir@/man1 VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ INSTALL = @INSTALL@ +INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_LINK = cp -av +DESTDIR = +RM_FILE = rm -f +RM_DIR = rmdir -p --ignore-fail-on-non-empty # # This should be autodetected. @@ -132,7 +139,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) else -EXTRALIBS = -lXtst -lXrandr -lXdamage +EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) @@ -162,7 +169,7 @@ $(LIBDLL): $(LIBARCHIVE) -Wl,--enable-auto-import \ -Wl,--whole-archive ${LIBARCHIVE} \ -Wl,--no-whole-archive \ - ${LIBS} -L/usr/X11R6/lib + ${LIBS} $(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL) # $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS) @@ -178,15 +185,41 @@ depend.status: fi touch depend.status -install: install.bin install.man +install: install.bin install.lib install.man install.bin: +install.lib: all + $(INSTALL_DIR) $(DESTDIR)${libdir}/nx + $(INSTALL_DIR) $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir}/nx + $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) *.a $(DESTDIR)${libdir}/nx + $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + install.man: +uninstall: uninstall.bin uninstall.lib uninstall.man + +uninstall.bin: + +uninstall.lib: + $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so + $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a + for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done + $(RM_DIR) $(DESTDIR)${libdir}/nx/ + $(RM_DIR) $(DESTDIR)${includedir}/nx/ + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + +uninstall.man: + clean: - -rm -f *~ *.o *.bak st?????? core core.* *.out.* *.exe.stackdump \ + -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe distclean: clean - -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache + -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache configure diff --git a/nxcompshad/Misc.h b/nxcompshad/Misc.h index 6dc86359f..27f267036 100644 --- a/nxcompshad/Misc.h +++ b/nxcompshad/Misc.h @@ -20,8 +20,8 @@ #include <iostream> -#include <errno.h> -#include <string.h> +#include <cerrno> +#include <cstring> using namespace std; diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index 3f16ee97f..13149b3a0 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="-O3" -CPPFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3" +CPPFLAGS="$CPPFLAGS -O3" dnl Reset default linking directives. @@ -19,7 +19,7 @@ dnl Prefer headers and libraries from nx-X11, if present. if test -d "../nx-X11/exports/include" ; then CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" - LIBS="$LIBS -L../nx-X11/exports/lib" + LIBS="-L../nx-X11/exports/lib" fi dnl Check whether --with-ipaq was given. |