1 From: Markus Koschany <apo@gambaru.de>
2 Date: Sun, 3 Aug 2014 22:50:46 +0200
3 Subject: missing separators
5 Bug: https://bugs.debian.org/750082
8 src/Makefile.am | 14 +++++++-------
9 src/Makefile.in | 14 +++++++-------
10 test/Makefile.am | 2 +-
11 test/Makefile.in | 2 +-
12 4 files changed, 16 insertions(+), 16 deletions(-)
14 diff --git a/src/Makefile.am b/src/Makefile.am
15 index fbd7e8f..96768d3 100755
18 @@ -29,7 +29,7 @@ Script.cpp \
22 -dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
23 +# libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
25 pininclude_HEADERS = \
27 @@ -56,10 +56,10 @@ Table.h
28 # libemilia_pin.a libemilia_addon.a libemilia_base.a libltdlc.a
29 wpinball.exe: ${pinball_OBJECTS} ${pinball_DEPENDENCIES}
30 ${GCCLOCALDIR}g++ -g -W -Wall -O2 -o$@ $^ \
31 - -lSDL_mixer -lvorbisfile -lvorbis -logg -lsmpeg \
32 - -lSDL_image -lSDLmain -lSDL \
33 - -lglu32 -lopengl32 -ljpeg -lpng \
34 - -lwinmm -luser32 -lgdi32 -ldxguid \
35 - -lmingw32 -lSDLmain -lSDL -mwindows \
36 - -L${GCCLOCALDIR}../lib
37 + -lSDL_mixer -lvorbisfile -lvorbis -logg -lsmpeg \
38 + -lSDL_image -lSDLmain -lSDL \
39 + -lglu32 -lopengl32 -ljpeg -lpng \
40 + -lwinmm -luser32 -lgdi32 -ldxguid \
41 + -lmingw32 -lSDLmain -lSDL -mwindows \
42 + -L${GCCLOCALDIR}../lib
43 # !-rzr : # have to solve it later # -lstdc++
44 diff --git a/src/Makefile.in b/src/Makefile.in
45 index ea7651b..8e95cd6 100644
48 @@ -505,7 +505,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
49 uninstall-pinincludeHEADERS uninstall-pinlibLIBRARIES
52 -dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
53 + dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
55 # !+rzr : This trick workaround a bad generated rule (under Linux mingw32)
56 # src/ litool returns: -L/usr/local//lib /usr/lib/libjpeg.so
57 @@ -514,12 +514,12 @@ dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
58 # libemilia_pin.a libemilia_addon.a libemilia_base.a libltdlc.a
59 wpinball.exe: ${pinball_OBJECTS} ${pinball_DEPENDENCIES}
60 ${GCCLOCALDIR}g++ -g -W -Wall -O2 -o$@ $^ \
61 - -lSDL_mixer -lvorbisfile -lvorbis -logg -lsmpeg \
62 - -lSDL_image -lSDLmain -lSDL \
63 - -lglu32 -lopengl32 -ljpeg -lpng \
64 - -lwinmm -luser32 -lgdi32 -ldxguid \
65 - -lmingw32 -lSDLmain -lSDL -mwindows \
66 - -L${GCCLOCALDIR}../lib
67 + -lSDL_mixer -lvorbisfile -lvorbis -logg -lsmpeg \
68 + -lSDL_image -lSDLmain -lSDL \
69 + -lglu32 -lopengl32 -ljpeg -lpng \
70 + -lwinmm -luser32 -lgdi32 -ldxguid \
71 + -lmingw32 -lSDLmain -lSDL -mwindows \
72 + -L${GCCLOCALDIR}../lib
73 # !-rzr : # have to solve it later # -lstdc++
74 # Tell versions [3.59,3.63) of GNU make to not export all variables.
75 # Otherwise a system limit (for SysV at least) may be exceeded.
76 diff --git a/test/Makefile.am b/test/Makefile.am
77 index d87cf34..ea3ffc9 100755
78 --- a/test/Makefile.am
79 +++ b/test/Makefile.am
80 @@ -4,7 +4,7 @@ testlibdir = $(EM_LIBDIR)
81 testdatadir = $(pkgdatadir)
83 noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
84 -dnl noinst_PROGRAMS = unittest
85 +# noinst_PROGRAMS = unittest
87 INCLUDES = -I../base -I../addon -I../src @INCLTDL@
88 LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
89 diff --git a/test/Makefile.in b/test/Makefile.in
90 index 6ba2646..47654dc 100644
91 --- a/test/Makefile.in
92 +++ b/test/Makefile.in
93 @@ -621,7 +621,7 @@ uninstall-am: uninstall-info-am uninstall-testlibLTLIBRARIES
94 mostlyclean-generic mostlyclean-libtool tags uninstall \
95 uninstall-am uninstall-info-am uninstall-testlibLTLIBRARIES
97 -dnl noinst_PROGRAMS = unittest
98 +# noinst_PROGRAMS = unittest
99 # Tell versions [3.59,3.63) of GNU make to not export all variables.
100 # Otherwise a system limit (for SysV at least) may be exceeded.