Don't use sdlmain in the pak tool

[quix0rs-blobwars.git] / makefile

diff --git a/makefile b/makefile
index 5c189bbc315d4b151e750105c11bbd2c6a0f847f..509c2ff862740f21acbab3274a2084beeee0c017 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -4,7 +4,7 @@ DOCS = doc/*
 ICONS = icons/
 DATA = data gfx sound music
 
-VERSION = 1.18
+VERSION = 1.19
 RELEASE ?= 0
 USEPAK ?= 0
 
@@ -82,16 +82,16 @@ all: $(ALL)
 
 # linking the program.
 $(PROG): $(GAMEOBJS)
-       $(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
+       $(CXX) $(GAMEOBJS) -o $(PROG) $(LIBS)
        
 pak: $(PAKOBJS)
-       $(CXX) $(LIBS) $(PAKOBJS) -o pak
+       $(CXX) $(PAKOBJS) -o pak $(LIBS)
 
 %.mo: %.po
        msgfmt -c -o $@ $<
 
 mapeditor: $(MAPOBJS)
-       $(CXX) $(LIBS) $(MAPOBJS) -o mapeditor
+       $(CXX) $(MAPOBJS) -o mapeditor $(LIBS)
 
 # cleaning everything that can be automatically recreated with "make".
 clean:
@@ -116,12 +116,13 @@ install: $(ALL)
 ifeq ($(USEPAK), 1)
        install -m 644 $(PAKNAME) $(DESTDIR)$(DATADIR)$(PAKNAME)
 else
-       cp -r $(DATA) $(DESTDIR)$(DATADIR)
+       cp -pr $(DATA) $(DESTDIR)$(DATADIR)
 endif
-       cp $(ICONS)$(PROG).png $(DESTDIR)$(ICONDIR)32x32/apps/
-       cp $(ICONS)$(PROG)-mini.png $(DESTDIR)$(ICONDIR)16x16/apps/$(PROG).png
-       cp $(ICONS)$(PROG)-large.png $(DESTDIR)$(ICONDIR)64x64/apps/$(PROG).png
-       cp $(ICONS)$(PROG).desktop $(DESTDIR)$(DESKTOPDIR)
+       cp -p $(DOCS) $(DESTDIR)$(DOCDIR)
+       cp -p $(ICONS)$(PROG).png $(DESTDIR)$(ICONDIR)32x32/apps/
+       cp -p $(ICONS)$(PROG)-mini.png $(DESTDIR)$(ICONDIR)16x16/apps/$(PROG).png
+       cp -p $(ICONS)$(PROG)-large.png $(DESTDIR)$(ICONDIR)64x64/apps/$(PROG).png
+       cp -p $(ICONS)$(PROG).desktop $(DESTDIR)$(DESKTOPDIR)
 
        @for f in $(LOCALE_MO); do \
                lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \