[SCM] libdvdnav/master: Remove files from git that are removed on clean.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Sat Jan 11 23:45:26 UTC 2014
The following commit has been merged in the master branch:
commit 3d68de6dc1c05794b81c121534b3a0172b1d8792
Author: Benjamin Drung <bdrung at debian.org>
Date: Sat Jan 11 23:43:44 2014 +0100
Remove files from git that are removed on clean.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 641a418..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,239 +0,0 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-New build system
-================
-
- The `configure2' shell script is a replacement for the autotools-
--based `configure'. Either use only `configure2' or run `autoreconf'
-and use the generated `configure'. Note that running `configure'
-overwrites the original Makefiles necessary for `configure2', so
-compilation won't succeed if you try using `configure2` after running
-`configure'.
-
-Basic Installation
-==================
-
- These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/Makefile b/Makefile
deleted file mode 100644
index cf1c4fc..0000000
--- a/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-include config.mak
-
-.SUFFIXES: .so
-
-AR=ar
-LD=ld
-RANLIB=ranlib
-
-VPATH+= $(SRC_PATH_BARE)/src
-SRCS = dvdnav.c highlight.c navigation.c read_cache.c remap.c searching.c settings.c
-
-VPATH+= $(SRC_PATH_BARE)/src/vm
-SRCS+= decoder.c vm.c vmcmd.c
-
-HEADERS = src/dvdnav/dvd_types.h src/dvdnav/dvdnav.h src/dvdnav/dvdnav_events.h
-
-CFLAGS += $(USEDEBUG) -Wall -funsigned-char
-CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm
-CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H
-
-L=libdvdnav
-MINI_L=libdvdnavmini
-CFLAGS += $(DVDREAD_CFLAGS)
-
-LIB = $(L).a
-SHLIB = $(L).so
-MINI_SHLIB = $(MINI_L).so
-
-.OBJDIR= obj
-DEPFLAG = -M
-
-OBJS = $(patsubst %.c,%.o, $(SRCS))
-SHOBJS = $(patsubst %.c,%.so, $(SRCS))
-DEPS= ${OBJS:%.o=%.d}
-
-BUILDDEPS = Makefile config.mak
-
-ifeq ($(BUILD_SHARED),yes)
-all: $(SHLIB) $(MINI_SHLIB) dvdnav-config pkgconfig
-install: $(SHLIB) install-shared install-dvdnav-config install-pkgconfig
-endif
-
-ifeq ($(BUILD_STATIC),yes)
-all: $(LIB) dvdnav-config pkgconfig
-install: $(LIB) install-static install-dvdnav-config install-pkgconfig
-endif
-
-install: install-headers
-
-# Let version.sh create version.h
-
-SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
-ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
-version.h: $(SVN_ENTRIES)
-endif
-
-version.h:
- sh $(SRC_PATH)/version.sh $(SRC_PATH) "$(SHLIB_VERSION)"
-
-$(SRCS): version.h
-
-
-# General targets
-
-${LIB}: version.h $(OBJS) $(BUILDDEPS)
- cd $(.OBJDIR) && $(AR) rc $@ $(OBJS)
- cd $(.OBJDIR) && $(RANLIB) $@
-
-${SHLIB}: version.h $(SHOBJS) $(BUILDDEPS)
- cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) $(DVDREAD_LIBS) $(THREADLIB)
-${MINI_SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
- cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(MINI_SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) $(THREADLIB)
-
-.c.so: $(BUILDDEPS)
- cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $<
-
-.c.o: $(BUILDDEPS)
- cd $(.OBJDIR) && $(CC) -MD $(CFLAGS) -c -o $@ $<
-
-
-# Install targets
-
-install-headers:
- install -d $(DESTDIR)$(incdir)
- install -m 644 $(HEADERS) $(DESTDIR)$(incdir)
-
-install-shared: $(SHLIB)
- install -d $(DESTDIR)$(shlibdir)
-
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(SHLIB) \
- $(DESTDIR)$(shlibdir)/$(SHLIB).$(SHLIB_VERSION)
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(MINI_SHLIB) \
- $(DESTDIR)$(shlibdir)/$(MINI_SHLIB).$(SHLIB_VERSION)
-
- cd $(DESTDIR)$(shlibdir) && \
- ln -sf $(SHLIB).$(SHLIB_VERSION) $(SHLIB).$(SHLIB_MAJOR)
- cd $(DESTDIR)$(shlibdir) && \
- ln -sf $(MINI_SHLIB).$(SHLIB_VERSION) $(MINI_SHLIB).$(SHLIB_MAJOR)
- cd $(DESTDIR)$(shlibdir) && \
- ln -sf $(SHLIB).$(SHLIB_MAJOR) $(SHLIB)
- cd $(DESTDIR)$(shlibdir) && \
- ln -sf $(MINI_SHLIB).$(SHLIB_MAJOR) $(MINI_SHLIB)
-
-
-install-static: $(LIB)
- install -d $(DESTDIR)$(libdir)
-
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(DESTDIR)$(libdir)/$(LIB)
-
-
-# Clean targets
-
-clean:
- rm -rf *~ $(.OBJDIR)/* version.h
-
-pcedit = sed \
- -e 's, at prefix@,$(PREFIX),' \
- -e 's, at exec_prefix@,$(PREFIX),' \
- -e 's, at libdir@,$(shlibdir),' \
- -e 's, at includedir@,$(PREFIX)/include,' \
- -e 's, at VERSION@,$(SHLIB_VERSION),' \
- -e 's, at THREAD_CFLAGS@,,' \
- -e 's, at THREAD_LIBS@,$(THREADLIB),' \
- -e 's, at DVDREAD_CFLAGS@,$(DVDREAD_CFLAGS),'
-
-pkgconfig: $(.OBJDIR)/dvdnav.pc $(.OBJDIR)/dvdnavmini.pc
-$(.OBJDIR)/dvdnav.pc: misc/dvdnav.pc.in $(BUILDDEPS)
- $(pcedit) $< > $@
-$(.OBJDIR)/dvdnavmini.pc: misc/dvdnavmini.pc.in $(BUILDDEPS)
- $(pcedit) $< > $@
-
-install-pkgconfig: $(.OBJDIR)/dvdnav.pc $(.OBJDIR)/dvdnavmini.pc
- install -d $(DESTDIR)$(libdir)/pkgconfig
- install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdir)/pkgconfig
- install -m 0644 $(.OBJDIR)/dvdnavmini.pc \
- $(DESTDIR)$(libdir)/pkgconfig
-
-distclean: clean
- find . -name "*~" | xargs rm -rf
- rm -rf config.mak $(.OBJDIR)
-
-dvdnav-config: $(.OBJDIR)/dvdnav-config
-$(.OBJDIR)/dvdnav-config: $(BUILDDEPS)
- @echo '#!/bin/sh' > $(.OBJDIR)/dvdnav-config
- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdnav-config
- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdnav-config
- @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdnav-config
- @echo 'dvdread_cflags="'$(DVDREAD_CFLAGS)'"' >> $(.OBJDIR)/dvdnav-config
- @echo 'dvdread_libs="'$(DVDREAD_LIBS)'"' >> $(.OBJDIR)/dvdnav-config
- @echo 'threadlib='$(THREADLIB) >> $(.OBJDIR)/dvdnav-config
- @echo >> $(.OBJDIR)/dvdnav-config
- cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config
- chmod 0755 $(.OBJDIR)/dvdnav-config
-
-install-dvdnav-config: dvdnav-config
- install -d $(DESTDIR)$(PREFIX)/bin
- install -m 0755 $(.OBJDIR)/dvdnav-config $(DESTDIR)$(PREFIX)/bin/dvdnav-config
-
-vpath %.so ${.OBJDIR}
-vpath %.o ${.OBJDIR}
-vpath ${LIB} ${.OBJDIR}
-
-# include dependency files if they exist
-$(addprefix ${.OBJDIR}/, ${DEPS}): ;
--include $(addprefix ${.OBJDIR}/, ${DEPS})
--
libdvdnav packaging
More information about the pkg-multimedia-commits
mailing list