Makefiles cleanups: r_explosion.o was declared twice in all Makefiles; removed some...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2840 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/makefile b/makefile
index 7f2ebe5444396578625438897f78ad0840f2f9a5..507f6233cdb806b1fa7bc8fffe04def469186c65 100644 (file)
--- a/makefile
+++ b/makefile
@@ -41,7 +41,7 @@ CLIENTOBJECTS=        cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \
                console.o dpvsimpledecode.o fractalnoise.o gl_backend.o \
                gl_draw.o gl_models.o gl_rmain.o gl_rsurf.o gl_textures.o \
                jpeg.o keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o \
-               r_explosion.o r_lerpanim.o r_light.o r_modules.o r_sky.o \
+               r_lerpanim.o r_light.o r_modules.o r_sky.o \
                r_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o \
                r_shadow.o
 SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_light.o sv_main.o sv_move.o \
@@ -84,7 +84,7 @@ EXE_DED=darkplaces-dedicated
 
 GLX_LIB=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(SOUNDLIB)
 
-DO_LD=$(CC) $(LDFLAGS) -o $@ $^
+DO_LD=$(CC) -o $@ $^ $(LDFLAGS)
 
 
 ##### Commands #####
@@ -140,54 +140,42 @@ ded-release :
 bin-debug :
        @echo
        @echo "========== $(EXE) (debug) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_DEBUG) \
-#                                    $(OPTIM_DEBUG)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
-               LDFLAGS="$(LDFLAGS_DEBUG)"
+               LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
 
 bin-profile :
        @echo
        @echo "========== $(EXE) (profile) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_PROFILE) \
-#                                    $(OPTIM_RELEASE)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
-               LDFLAGS="$(LDFLAGS_PROFILE)"
+               LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
 
 bin-release :
        @echo
        @echo "========== $(EXE) (release) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_RELEASE) \
-#                                    $(OPTIM_RELEASE)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
-               LDFLAGS="$(LDFLAGS_RELEASE)"
+               LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
+       strip $(EXE)
 
 builddate:
        touch builddate.c
 
 vid_glx.o: vid_glx.c
-#      @echo "   Compiling" $<
        $(DO_CC) -I/usr/X11R6/include
 
 .c.o:
-#      @echo "   Compiling" $<
        $(DO_CC)
 
 $(EXE_GLX):  $(OBJ_COMMON) $(OBJ_GLX)
-#      @echo "   Linking  " $@
-       $(DO_LD) $(GLX_LIB) $(LDFLAGS_COMMON)
+       $(DO_LD) $(GLX_LIB)
 
 $(EXE_DED): $(OBJ_COMMON) $(OBJ_DED)
-#      @echo "   Linking  " $@
-       $(DO_LD) $(LDFLAGS_COMMON)
+       $(DO_LD)
 
 clean:
        rm -f $(EXE_GLX) $(EXE_DED) *.o *.d

diff --git a/makefile.mingw b/makefile.mingw
index 446f147a7e9c16aa5d640c727c51d14f8d4e3196..0c08811f9852334e1cada8f5e1ab1d2f04862ced 100644 (file)
--- a/makefile.mingw
+++ b/makefile.mingw
@@ -1,5 +1,16 @@
 
-OBJECTS= builddate.o chase.o cl_demo.o cl_input.o cl_main.o cl_parse.o cmd.o common.o console.o crc.o cvar.o fractalnoise.o gl_draw.o r_sky.o gl_rmain.o gl_rsurf.o host.o host_cmd.o image.o keys.o mathlib.o menu.o model_alias.o model_brush.o model_shared.o model_sprite.o net_dgrm.o net_loop.o net_main.o pr_cmds.o pr_edict.o pr_exec.o r_light.o r_explosion.o sbar.o snd_dma.o snd_mem.o snd_mix.o sv_main.o sv_move.o sv_phys.o sv_user.o sv_light.o view.o wad.o world.o zone.o vid_shared.o palette.o r_crosshairs.o gl_textures.o gl_models.o r_sprites.o r_modules.o r_explosion.o r_lerpanim.o protocol.o quakeio.o ui.o portals.o sys_shared.o gl_backend.o cl_particles.o cl_screen.o cgamevm.o cgame.o filematch.o collision.o cl_collision.o matrixlib.o cl_video.o dpvsimpledecode.o wavefile.o meshqueue.o net_master.o r_shadow.o jpeg.o
+OBJECTS= builddate.o chase.o cl_demo.o cl_input.o cl_main.o cl_parse.o cmd.o \
+       common.o console.o crc.o cvar.o fractalnoise.o gl_draw.o r_sky.o \
+       gl_rmain.o gl_rsurf.o host.o host_cmd.o image.o keys.o mathlib.o menu.o \
+       model_alias.o model_brush.o model_shared.o model_sprite.o net_dgrm.o \
+       net_loop.o net_main.o pr_cmds.o pr_edict.o pr_exec.o r_light.o \
+       sbar.o snd_dma.o snd_mem.o snd_mix.o sv_main.o sv_move.o \
+       sv_phys.o sv_user.o sv_light.o view.o wad.o world.o zone.o vid_shared.o \
+       palette.o r_crosshairs.o gl_textures.o gl_models.o r_sprites.o \
+       r_modules.o r_explosion.o r_lerpanim.o protocol.o quakeio.o ui.o \
+       portals.o sys_shared.o gl_backend.o cl_particles.o cl_screen.o cgamevm.o \
+       cgame.o filematch.o collision.o cl_collision.o matrixlib.o cl_video.o \
+       dpvsimpledecode.o wavefile.o meshqueue.o net_master.o r_shadow.o jpeg.o
 
 #K6/athlon optimizations
 #CPUOPTIMIZATIONS=-march=k6

diff --git a/makefile.mingwcross b/makefile.mingwcross
index 1914415ede681514a1474ddfe145c668f43ef9e4..16642b4ab05a29e16b2ac1a56074c68eaa90dcc0 100644 (file)
--- a/makefile.mingwcross
+++ b/makefile.mingwcross
@@ -28,7 +28,7 @@ CLIENTOBJECTS=        cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \
                console.o dpvsimpledecode.o fractalnoise.o gl_backend.o \
                gl_draw.o gl_models.o gl_rmain.o gl_rsurf.o gl_textures.o \
                jpeg.o keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o \
-               r_explosion.o r_lerpanim.o r_light.o r_modules.o r_sky.o \
+               r_lerpanim.o r_light.o r_modules.o r_sky.o \
                r_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o \
                r_shadow.o conproc.o
 SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_light.o sv_main.o sv_move.o \
@@ -85,17 +85,17 @@ DO_LD=$(CC) -o $@ $^ $(LDFLAGS)
 help:
        @echo
        @echo "===== Choose one ====="
-       @echo "* clean       : delete the binaries, and .o and .d files"
-       @echo "* help        : this help"
-       @echo "* debug       : make WGL and dedicated binaries (debug versions)"
-       @echo "* profile     : make WGL and dedicated binaries (profile versions)"
-       @echo "* release     : make WGL and dedicated binaries (release versions)"
-       @echo "* wgl-debug   : make WGL binary (debug version)"
-       @echo "* wgl-profile : make WGL binary (profile version)"
-       @echo "* wgl-release : make WGL binary (release version)"
-       @echo "* ded-debug   : make dedicated server (debug version)"
-       @echo "* ded-profile : make dedicated server (profile version)"
-       @echo "* ded-release : make dedicated server (release version)"
+       @echo "* $(MAKE) clean       : delete the binaries, and .o and .d files"
+       @echo "* $(MAKE) help        : this help"
+       @echo "* $(MAKE) debug       : make WGL and dedicated binaries (debug versions)"
+       @echo "* $(MAKE) profile     : make WGL and dedicated binaries (profile versions)"
+       @echo "* $(MAKE) release     : make WGL and dedicated binaries (release versions)"
+       @echo "* $(MAKE) wgl-debug   : make WGL binary (debug version)"
+       @echo "* $(MAKE) wgl-profile : make WGL binary (profile version)"
+       @echo "* $(MAKE) wgl-release : make WGL binary (release version)"
+       @echo "* $(MAKE) ded-debug   : make dedicated server (debug version)"
+       @echo "* $(MAKE) ded-profile : make dedicated server (profile version)"
+       @echo "* $(MAKE) ded-release : make dedicated server (release version)"
        @echo
 
 debug :
@@ -128,50 +128,38 @@ ded-release :
 bin-debug :
        @echo
        @echo "========== $(EXE) (debug) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_DEBUG) \
-#                                    $(OPTIM_DEBUG)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) -f makefile.mingwcross $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_DEBUG)"
+               LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
 
 bin-profile :
        @echo
        @echo "========== $(EXE) (profile) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_PROFILE) \
-#                                    $(OPTIM_RELEASE)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) -f makefile.mingwcross $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_PROFILE)"
+               LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
 
 bin-release :
        @echo
        @echo "========== $(EXE) (release) =========="
-#      @echo Using compiler $(CC)
-#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_RELEASE) \
-#                                    $(OPTIM_RELEASE)
-#      @echo
+       $(MAKE) builddate
        $(MAKE) -f makefile.mingwcross $(EXE) \
                CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
-               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_RELEASE)"
+               LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
+       strip $(EXE)
 
 builddate:
        touch builddate.c
 
 .c.o:
-#      @echo "   Compiling" $<
        $(DO_CC)
 
 $(EXE_WGL):  $(OBJ_COMMON) $(OBJ_WGL)
-#      @echo "   Linking  " $@
        $(DO_LD) $(WGL_LIB)
-       strip $(EXE_WGL)
 
 $(EXE_DED): $(OBJ_COMMON) $(OBJ_DED)
-#      @echo "   Linking  " $@
        $(DO_LD)
 
 clean: