aboutsummaryrefslogtreecommitdiff
path: root/nxcompshad/Makefile.in
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-03-28 08:58:35 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-03-28 08:58:35 +0100
commitdb7feaf9883bb0dc419593588036405ef12ebca1 (patch)
tree1a911fe1a08aed78845e17b5350c9238452a12dd /nxcompshad/Makefile.in
parente77bf36d9afbc7e56522574b06217d57c11dd095 (diff)
downloadnx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.gz
nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.bz2
nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.zip
Revert "release 3.5.0.19"
This reverts commit e77bf36d9afbc7e56522574b06217d57c11dd095.
Diffstat (limited to 'nxcompshad/Makefile.in')
-rw-r--r--nxcompshad/Makefile.in45
1 files changed, 6 insertions, 39 deletions
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 089a4f680..1580a3594 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -48,7 +48,7 @@ CCINCLUDES =
CCDEFINES =
LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ -lNX_X11
+LIBS = @LIBS@ -L/usr/X11R6/lib -lX11
#
# Only if THREADS is defined.
@@ -74,17 +74,10 @@ 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.
@@ -139,7 +132,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL)
else
-EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage
+EXTRALIBS = -lXtst -lXrandr -lXdamage
all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
@@ -169,7 +162,7 @@ $(LIBDLL): $(LIBARCHIVE)
-Wl,--enable-auto-import \
-Wl,--whole-archive ${LIBARCHIVE} \
-Wl,--no-whole-archive \
- ${LIBS}
+ ${LIBS} -L/usr/X11R6/lib
$(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL)
# $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS)
@@ -185,41 +178,15 @@ depend.status:
fi
touch depend.status
-install: install.bin install.lib install.man
+install: install.bin 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 *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
+ -rm -f *~ *.o *.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 configure
+ -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache