diff options
| author | Winfried <szukw000@arcor.de> | 2010-10-17 22:42:46 +0000 |
|---|---|---|
| committer | Winfried <szukw000@arcor.de> | 2010-10-17 22:42:46 +0000 |
| commit | f4b08bacb03457eae440ed88f70ac1598f2cee42 (patch) | |
| tree | fcda8e7487cd5979586be05cdccad12af59af62b /jpwl | |
| parent | ae6cf3da7dd5e5e1061b9da2c693674399e79874 (diff) | |
-This line, and those below, will be ignored--
M configure
M Makefile.in
M opj_config.h.in.user
M mj2/Makefile.in
M mj2/Makefile.am
M mj2/Makefile.nix
M libopenjpeg/Makefile.in
M jp3d/Makefile.in
M jp3d/libjp3dvm/Makefile.in
M jp3d/Makefile.nix
M jp3d/codec/Makefile.in
M jp3d/codec/Makefile.am
M config.nix
M configure.ac
M doc/Makefile.in
M doc/Makefile.am
M doc/Makefile.nix
M INSTALL
M CHANGES
M jpwl/Makefile.in
M jpwl/Makefile.am
M jpwl/Makefile.nix
M Makefile.am
M Makefile.nix
M codec/Makefile.in
M codec/Makefile.am
Diffstat (limited to 'jpwl')
| -rw-r--r-- | jpwl/Makefile.am | 2 | ||||
| -rw-r--r-- | jpwl/Makefile.in | 3 | ||||
| -rw-r--r-- | jpwl/Makefile.nix | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am index 3f80e738..e379bde0 100644 --- a/jpwl/Makefile.am +++ b/jpwl/Makefile.am @@ -38,7 +38,7 @@ DOS2UNIX = dos2unix dos2unix: @$(DOS2UNIX) $(SRCS) $(INCLS) -COMPILERFLAGS = -Wall -ffast-math -std=c99 +COMPILERFLAGS = -Wall -ffast-math -std=c99 -static USERLIBS = -lm INCLUDES = -I.. -I. -I../libopenjpeg diff --git a/jpwl/Makefile.in b/jpwl/Makefile.in index 8fdba662..93b0e21f 100644 --- a/jpwl/Makefile.in +++ b/jpwl/Makefile.in @@ -223,7 +223,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -doxy_dir = @doxy_dir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ @@ -303,7 +302,7 @@ libopenjpeg_JPWL_la_LIBADD = @LDLIBS@ # Converts cr/lf to just lf DOS2UNIX = dos2unix -COMPILERFLAGS = -Wall -ffast-math -std=c99 +COMPILERFLAGS = -Wall -ffast-math -std=c99 -static USERLIBS = -lm $(am__append_2) $(am__append_4) $(am__append_6) \ $(am__append_8) INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_1) $(am__append_3) \ diff --git a/jpwl/Makefile.nix b/jpwl/Makefile.nix index 40874565..c78c0d71 100644 --- a/jpwl/Makefile.nix +++ b/jpwl/Makefile.nix @@ -139,7 +139,7 @@ uninstall: rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB) ifeq ($(ENABLE_SHARED),yes) (cd $(DESTDIR)$(INSTALL_LIBDIR) && \ - rm $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB)) + rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB)) endif ldconfig rm -f $(DESTDIR)$(INSTALL_BIN)/JPWL_j2k_to_image |