diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-03-28 08:58:35 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-03-28 08:58:35 +0100 |
| commit | db7feaf9883bb0dc419593588036405ef12ebca1 (patch) | |
| tree | 1a911fe1a08aed78845e17b5350c9238452a12dd /nxcompext | |
| parent | e77bf36d9afbc7e56522574b06217d57c11dd095 (diff) | |
| download | nx-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 'nxcompext')
| -rw-r--r-- | nxcompext/Makefile.in | 37 | ||||
| -rw-r--r-- | nxcompext/configure.in | 4 |
2 files changed, 7 insertions, 34 deletions
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index ff1bd8bc3..cdf0b1cd9 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -42,12 +42,12 @@ CCINCLUDES = -I. -I../nxcomp CCDEFINES = LDFLAGS = @LDFLAGS@ -L../nxcomp -LIBS = @LIBS@ -lz -lNX_X11 -lXcomp +LIBS = @LIBS@ -lz -lX11 -lXcomp # # Only if THREADS is defined # -# LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp +# LIBS = @LIBS@ -lz -ljpeg -lpthread -lX11 -lXcomp # srcdir = @srcdir@ @@ -56,15 +56,11 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ man1dir = @mandir@/man1 VPATH = @srcdir@ -libdir = @libdir@ -includedir = @includedir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_LINK = cp -av -DESTDIR = -RM_FILE = rm -f + # # This should be autodetected. # @@ -151,39 +147,16 @@ depend.status: fi touch depend.status -install: install.bin install.lib install.man +install: install.bin install.man install.bin: -install.lib: all - ./mkinstalldirs $(DESTDIR)${libdir}/nx - ./mkinstalldirs $(DESTDIR)${includedir}/nx - $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx - $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir}/nx - $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir}/nx - $(INSTALL_DATA) NX*.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/libXcompext.so.3 - $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so - $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h - $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h - echo "Running ldconfig tool, this may take a while..." && ldconfig || true - -uninstall.man: - clean: -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ @ALL@ distclean: clean - -rm -rf autom4te.cache config.status config.log configure \ + -rm -rf autom4te.cache config.status config.log \ config.cache depend.status Makefile tags diff --git a/nxcompext/configure.in b/nxcompext/configure.in index 08c48a751..fe5abf7cb 100644 --- a/nxcompext/configure.in +++ b/nxcompext/configure.in @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="$CXXFLAGS -O3" -CFLAGS="$CFLAGS -O3" +CXXFLAGS="-O3" +CFLAGS="-O3" dnl Reset default linking directives. |