27 lines
1.4 KiB
Text
27 lines
1.4 KiB
Text
--- server/mp4live/Makefile.in.orig 2007-10-08 12:11:18.000000000 -0300
|
|
+++ server/mp4live/Makefile.in 2013-10-08 22:45:00.417159508 -0300
|
|
@@ -122,18 +122,18 @@
|
|
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
|
am__depfiles_maybe = depfiles
|
|
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
+COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
+ $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
|
|
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
|
+ $(CPPFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(AM_CFLAGS) $(CFLAGS)
|
|
CCLD = $(CC)
|
|
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
|
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
+CXXCOMPILE = $(CXX) $(DEFS) $(CPPFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
|
+ $(AM_CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
|
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
|
|
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
|
+ $(CPPFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
$(AM_CXXFLAGS) $(CXXFLAGS)
|
|
CXXLD = $(CXX)
|
|
CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|