blob: c5f67f0058857b96d39efa4ff99d6b8e05afb57c (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
--- Makefile.in.orig 2010-07-28 14:56:32.000000000 +0200
+++ Makefile.in 2010-08-05 23:30:34.000000000 +0200
@@ -190,11 +190,11 @@
-Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser
RUNAR = $(AR) rcu
-LINK = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS)
-LINKSHARED = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS) \
+LINK = $(CXX) $(SYSTEM_LIBDIRS) $(LDFLAGS) $(LIBDIRS)
+LINKSHARED = $(CXX) $(SYSTEM_LIBDIRS) $(LDFLAGS) $(LIBDIRS) \
-shared -Wl,--export-all
-CXXCOMPILE = $(CXX) $(CXXFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
-CCOMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
+CXXCOMPILE = $(CXX) $(SYSTEM_INCLUDES) $(CXXFLAGS) $(INCLUDES)
+CCOMPILE = $(CC) $(SYSTEM_INCLUDES) $(CFLAGS) $(INCLUDES)
RCCOMPILE = $(WINDRES) $(WXWIDGETS_INCLUDES) -Isrc/mmg
ALL_SOURCES=$(wildcard lib/avilib-0.6.10/*.c) $(wildcard lib/avilib-0.6.10/*.cpp) \
@@ -251,7 +251,7 @@
all: $(MANPAGES_DEP) $(TAGSFILE) $(APPLICATIONS) $(TRANSLATIONS_MOS) $(HTMLHELPBOOKS)
-install: install-programs $(TARGET_INSTALL_SHARED) install-mans install-translated-mans install-trans install-guide
+install: install-programs $(TARGET_INSTALL_SHARED) install-mans install-trans install-guide
install-programs: $(APPLICATIONS)
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
