fixed some very ewww bugs (a few .c files made their way into the .o lists)

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 5c1bc588530eb7811783fa23b54ea5c41a190594..dd547b342a81772c50133ba8ec9d9ac7acd9a891 100644 (file)
--- a/makefile
+++ b/makefile
@@ -40,10 +40,10 @@ CLIENTOBJECTS=      cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \
                cl_main.o cl_parse.o cl_particles.o cl_screen.o cl_video.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 \
-               keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.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_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o \
-               r_shadow.c
+               r_shadow.o
 SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_light.o sv_main.o sv_move.o \
                sv_phys.o sv_user.o
 SHAREDOBJECTS= builddate.o cmd.o collision.o common.o crc.o cvar.o \
@@ -51,17 +51,17 @@ SHAREDOBJECTS=      builddate.o cmd.o collision.o common.o crc.o cvar.o \
                model_alias.o model_brush.o model_shared.o model_sprite.o \
                net_bsd.o net_dgrm.o net_loop.o net_main.o net_master.o \
                net_udp.o palette.o portals.o protocol.o quakeio.o sys_linux.o \
-               sys_shared.o transform.o world.o wad.o zone.o
+               sys_shared.o world.o wad.o zone.o
 
 OBJ_COMMON= $(CLIENTOBJECTS) $(SERVEROBJECTS) $(SHAREDOBJECTS)
-OBJ_GLX= vid_glx.c $(OBJ_CD) $(OBJ_SND)
+OBJ_GLX= vid_glx.o $(OBJ_CD) $(OBJ_SND)
 OBJ_DED= vid_null.o cd_null.o snd_null.o
 
 
 # Compilation
 CFLAGS_COMMON=-MD -Wall -Werror
 CFLAGS_DEBUG=-ggdb
-CFLAGS_PROFILE=-pg
+CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=
 
 OPTIM_DEBUG=
@@ -72,7 +72,10 @@ DO_CC=$(CC) $(CFLAGS) -c $< -o $@
 
 
 # Link
-LDFLAGS=-lm -ldl
+LDFLAGS_COMMON=-lm -ldl
+LDFLAGS_DEBUG=-g -ggdb
+LDFLAGS_PROFILE=-g -pg
+LDFLAGS_RELEASE=
 
 EXE_GLX=darkplaces-glx
 EXE_DED=darkplaces-dedicated
@@ -106,82 +109,85 @@ help:
        @echo
 
 debug :
-       @$(MAKE) glx-debug ded-debug
+       $(MAKE) glx-debug ded-debug
 
 profile :
-       @$(MAKE) glx-profile ded-profile
+       $(MAKE) glx-profile ded-profile
 
 release :
-       @$(MAKE) glx-release ded-release
+       $(MAKE) glx-release ded-release
 
 glx-debug :
-       @$(MAKE) bin-debug EXE="$(EXE_GLX)"
+       $(MAKE) bin-debug EXE="$(EXE_GLX)"
 
 glx-profile :
-       @$(MAKE) bin-profile EXE="$(EXE_GLX)"
+       $(MAKE) bin-profile EXE="$(EXE_GLX)"
 
 glx-release :
-       @$(MAKE) bin-release EXE="$(EXE_GLX)"
+       $(MAKE) bin-release EXE="$(EXE_GLX)"
 
 ded-debug :
-       @$(MAKE) bin-debug EXE="$(EXE_DED)"
+       $(MAKE) bin-debug EXE="$(EXE_DED)"
 
 ded-profile :
-       @$(MAKE) bin-profile EXE="$(EXE_DED)"
+       $(MAKE) bin-profile EXE="$(EXE_DED)"
 
 ded-release :
-       @$(MAKE) bin-release EXE="$(EXE_DED)"
+       $(MAKE) bin-release EXE="$(EXE_DED)"
 
 bin-debug :
        @echo
        @echo "========== $(EXE) (debug) =========="
-       @echo Using compiler $(CC)
-       @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_DEBUG) \
-                                    $(OPTIM_DEBUG)
-       @echo
-       @$(MAKE) $(EXE) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"
+#      @echo Using compiler $(CC)
+#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_DEBUG) \
+#                                    $(OPTIM_DEBUG)
+#      @echo
+       $(MAKE) $(EXE) \
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
+               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_DEBUG)"
 
 bin-profile :
        @echo
        @echo "========== $(EXE) (profile) =========="
-       @echo Using compiler $(CC)
-       @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_PROFILE) \
-                                    $(OPTIM_RELEASE)
-       @echo
-       @$(MAKE) $(EXE) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"
+#      @echo Using compiler $(CC)
+#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_PROFILE) \
+#                                    $(OPTIM_RELEASE)
+#      @echo
+       $(MAKE) $(EXE) \
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
+               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_PROFILE)"
 
 bin-release :
        @echo
        @echo "========== $(EXE) (release) =========="
-       @echo Using compiler $(CC)
-       @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_RELEASE) \
-                                    $(OPTIM_RELEASE)
-       @echo
-       @$(MAKE) $(EXE) \
-               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"
+#      @echo Using compiler $(CC)
+#      @echo Compiling with flags: $(CFLAGS_COMMON) $(CFLAGS_RELEASE) \
+#                                    $(OPTIM_RELEASE)
+#      @echo
+       $(MAKE) $(EXE) \
+               CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
+               LDFLAGS="$(LDFLAGS_COMMON) $(LDFLAGS_RELEASE)"
 
 builddate:
        touch builddate.c
 
 vid_glx.o: vid_glx.c
-       @echo "   Compiling" $<
-       @$(DO_CC) -I/usr/X11R6/include
+#      @echo "   Compiling" $<
+       $(DO_CC) -I/usr/X11R6/include
 
 .c.o:
-       @echo "   Compiling" $<
-       @$(DO_CC)
+#      @echo "   Compiling" $<
+       $(DO_CC)
 
 $(EXE_GLX):  $(OBJ_COMMON) $(OBJ_GLX)
-       @echo "   Linking  " $@
-       @$(DO_LD) $(GLX_LIB)
+#      @echo "   Linking  " $@
+       $(DO_LD) $(GLX_LIB)
 
 $(EXE_DED): $(OBJ_COMMON) $(OBJ_DED)
-       @echo "   Linking  " $@
-       @$(DO_LD)
+#      @echo "   Linking  " $@
+       $(DO_LD)
 
 clean:
-       @rm -f $(EXE_GLX) $(EXE_DED) *.o *.d
+       rm -f $(EXE_GLX) $(EXE_DED) *.o *.d
 
 -include *.d