[Prboom-notes] r4530 - branches/prboom-plus-24/prboom2/src

[<web...@pr...>]

Author: rjy
Date: Sun Nov 19 21:06:17 2017
New Revision: 4530

Log:
src/Makefile.am: sort file lists, one per line

The original tabular layout had become eroded over the years as files
were added/removed/renamed. Also it is easier to make changes this way.

Modified:
   branches/prboom-plus-24/prboom2/src/Makefile.am

Modified: branches/prboom-plus-24/prboom2/src/Makefile.am
==============================================================================
--- branches/prboom-plus-24/prboom2/src/Makefile.am	Sat Nov 18 19:13:28 2017	(r4529)
+++ branches/prboom-plus-24/prboom2/src/Makefile.am	Sun Nov 19 21:06:17 2017	(r4530)
@@ -18,58 +18,189 @@
 
 CFLAGS = @CFLAGS@ @SDL_CFLAGS@
 
-prboom_plus_game_server_SOURCES = d_server.c protocol.h
-prboom_plus_game_server_LDADD = POSIX/libposixdoom.a SDL/i_network.o @NET_LIBS@ @SDL_LIBS@
 
 COMMON_SRC = \
- am_map.c       g_game.c           p_maputl.h       r_plane.h   \
- am_map.h       g_game.h           p_mobj.c         r_demo.c    r_segs.c    \
- hu_lib.c       lprintf.c          p_mobj.h         r_demo.h    r_segs.h    \
- hu_lib.h       lprintf.h          p_plats.c        r_sky.c	\
- d_deh.c        hu_stuff.c         m_argv.c         p_pspr.c    r_sky.h	    \
- d_deh.h        hu_stuff.h         m_argv.h         p_pspr.h    r_state.h   \
- d_englsh.h     i_joy.h            m_bbox.c         p_saveg.c   r_things.c  \
- d_event.h                         m_bbox.h         p_saveg.h   r_things.h  \
- d_items.c      i_network.h        m_cheat.c        p_setup.c   s_sound.c   \
- d_items.h      i_sound.h          m_cheat.h        p_setup.h   s_sound.h   \
- d_main.c       i_system.h         m_fixed.h        p_sight.c   sounds.c    \
- d_main.h       i_video.h          m_menu.c         p_spec.c    sounds.h    \
-                info.c             m_menu.h         p_spec.h    st_lib.c    \
- d_net.h        info.h             m_misc.c         p_switch.c  st_lib.h    \
- d_player.h                        m_misc.h         p_telept.c  st_stuff.c  \
- m_random.c     p_tick.c           st_stuff.h       i_main.h    \
- d_think.h      m_random.h         p_tick.h         tables.c    \
- d_ticcmd.h     m_swap.h           p_user.c         tables.h     \
- doomdata.h     p_ceilng.c         p_user.h         v_video.c   \
- doomdef.c      p_doors.c          protocol.h       v_video.h   \
- doomdef.h      p_enemy.c          r_bsp.c          version.c   \
- doomstat.c     p_enemy.h          r_bsp.h          version.h   \
- doomstat.h     p_floor.c          r_data.c         w_wad.c	\
- doomtype.h     p_genlin.c         r_data.h         w_wad.h	\
- dstrings.c     p_inter.c          r_defs.h         wi_stuff.c  \
- dstrings.h     p_inter.h          r_draw.c         wi_stuff.h  \
- f_finale.c     p_lights.c         r_draw.h         z_bmalloc.c \
- f_finale.h     p_map.c            r_main.c         z_bmalloc.h \
- f_wipe.c       p_map.h            r_main.h         z_zone.c    \
- f_wipe.h       p_maputl.c         r_plane.c        z_zone.h	\
- md5.c          md5.h              p_checksum.h     p_checksum.c \
- r_patch.c      r_patch.h          r_fps.c          r_fps.h \
- r_filter.c     r_filter.h \
- e6y.c          e6y.h \
- i_pcsound.c    i_pcsound.h \
- g_overflow.c   g_overflow.h       hu_tracers.c     hu_tracers.h \
- s_advsound.c   s_advsound.h       i_capture.c      i_capture.h \
- sc_man.c       sc_man.h
+ am_map.c \
+ am_map.h \
+ d_deh.c \
+ d_deh.h \
+ d_englsh.h \
+ d_event.h \
+ d_items.c \
+ d_items.h \
+ d_main.c \
+ d_main.h \
+ d_net.h \
+ d_player.h \
+ d_think.h \
+ d_ticcmd.h \
+ doomdata.h \
+ doomdef.c \
+ doomdef.h \
+ doomstat.c \
+ doomstat.h \
+ doomtype.h \
+ dstrings.c \
+ dstrings.h \
+ e6y.c \
+ e6y.h \
+ f_finale.c \
+ f_finale.h \
+ f_wipe.c \
+ f_wipe.h \
+ g_game.c \
+ g_game.h \
+ g_overflow.c \
+ g_overflow.h \
+ hu_lib.c \
+ hu_lib.h \
+ hu_stuff.c \
+ hu_stuff.h \
+ hu_tracers.c \
+ hu_tracers.h \
+ i_capture.c \
+ i_capture.h \
+ i_joy.h \
+ i_main.h \
+ i_network.h \
+ i_pcsound.c \
+ i_pcsound.h \
+ i_sound.h \
+ i_system.h \
+ i_video.h \
+ info.c \
+ info.h \
+ lprintf.c \
+ lprintf.h \
+ m_argv.c \
+ m_argv.h \
+ m_bbox.c \
+ m_bbox.h \
+ m_cheat.c \
+ m_cheat.h \
+ m_fixed.h \
+ m_menu.c \
+ m_menu.h \
+ m_misc.c \
+ m_misc.h \
+ m_random.c \
+ m_random.h \
+ m_swap.h \
+ md5.c \
+ md5.h \
+ p_ceilng.c \
+ p_checksum.c \
+ p_checksum.h \
+ p_doors.c \
+ p_enemy.c \
+ p_enemy.h \
+ p_floor.c \
+ p_genlin.c \
+ p_inter.c \
+ p_inter.h \
+ p_lights.c \
+ p_map.c \
+ p_map.h \
+ p_maputl.c \
+ p_maputl.h \
+ p_mobj.c \
+ p_mobj.h \
+ p_plats.c \
+ p_pspr.c \
+ p_pspr.h \
+ p_saveg.c \
+ p_saveg.h \
+ p_setup.c \
+ p_setup.h \
+ p_sight.c \
+ p_spec.c \
+ p_spec.h \
+ p_switch.c \
+ p_telept.c \
+ p_tick.c \
+ p_tick.h \
+ p_user.c \
+ p_user.h \
+ protocol.h \
+ r_bsp.c \
+ r_bsp.h \
+ r_data.c \
+ r_data.h \
+ r_defs.h \
+ r_demo.c \
+ r_demo.h \
+ r_draw.c \
+ r_draw.h \
+ r_filter.c \
+ r_filter.h \
+ r_fps.c \
+ r_fps.h \
+ r_main.c \
+ r_main.h \
+ r_patch.c \
+ r_patch.h \
+ r_plane.c \
+ r_plane.h \
+ r_segs.c \
+ r_segs.h \
+ r_sky.c \
+ r_sky.h \
+ r_state.h \
+ r_things.c \
+ r_things.h \
+ s_advsound.c \
+ s_advsound.h \
+ s_sound.c \
+ s_sound.h \
+ sc_man.c \
+ sc_man.h \
+ sounds.c \
+ sounds.h \
+ st_lib.c \
+ st_lib.h \
+ st_stuff.c \
+ st_stuff.h \
+ tables.c \
+ tables.h \
+ v_video.c \
+ v_video.h \
+ version.c \
+ version.h \
+ w_wad.c \
+ w_wad.h \
+ wi_stuff.c \
+ wi_stuff.h \
+ z_bmalloc.c \
+ z_bmalloc.h \
+ z_zone.c \
+ z_zone.h
 
 NET_CLIENT_SRC = d_client.c
 
 if BUILD_GL
 USE_GL_SRC = \
-  gl_opengl.c   gl_opengl.h \
-  gl_detail.c   gl_intern.h  gl_main.c    gl_struct.h  gl_texture.c         gl_vertex.c \
-  gl_wipe.c     gl_hires.c   gl_clipper.c gl_gamma.c   gl_missingtexture.c  gl_light.c \
-  gl_hqresize.c gl_sky.c     gl_fbo.c     gl_shadow.c  gl_map.c \
-  gl_preprocess.c  gl_drawinfo.c  gl_shader.c
+ gl_clipper.c \
+ gl_detail.c \
+ gl_drawinfo.c \
+ gl_fbo.c \
+ gl_gamma.c \
+ gl_hires.c \
+ gl_hqresize.c \
+ gl_intern.h \
+ gl_light.c \
+ gl_main.c \
+ gl_map.c \
+ gl_missingtexture.c \
+ gl_opengl.c \
+ gl_opengl.h \
+ gl_preprocess.c \
+ gl_shader.c \
+ gl_shadow.c \
+ gl_sky.c \
+ gl_struct.h \
+ gl_texture.c \
+ gl_vertex.c \
+ gl_wipe.c
 else
 USE_GL_SRC =
 endif
@@ -80,10 +211,43 @@
 WAD_SRC = w_memcache.c
 endif
 
-MUS2MID_SRC = memio.c memio.h mus2mid.c mus2mid.h
-
-prboom_plus_SOURCES = $(COMMON_SRC) $(NET_CLIENT_SRC) $(USE_GL_SRC) $(WAD_SRC) $(MUS2MID_SRC)
-prboom_plus_LDADD = SDL/libsdldoom.a PCSOUND/libpcsound.a TEXTSCREEN/libtextscreen.a MUSIC/libdoommusic.a @MIXER_LIBS@ @NET_LIBS@ @SDL_LIBS@ @GL_LIBS@ @MATH_LIB@
+MUS2MID_SRC = \
+ memio.c \
+ memio.h \
+ mus2mid.c \
+ mus2mid.h
+
+prboom_plus_SOURCES = \
+ $(COMMON_SRC) \
+ $(NET_CLIENT_SRC) \
+ $(USE_GL_SRC) \
+ $(WAD_SRC) \
+ $(MUS2MID_SRC)
+
+prboom_plus_LDADD = \
+ SDL/libsdldoom.a \
+ PCSOUND/libpcsound.a \
+ TEXTSCREEN/libtextscreen.a \
+ MUSIC/libdoommusic.a \
+ @MIXER_LIBS@ \
+ @NET_LIBS@ \
+ @SDL_LIBS@ \
+ @GL_LIBS@ \
+ @MATH_LIB@
+
+prboom_plus_game_server_SOURCES = \
+ d_server.c \
+ protocol.h
+
+prboom_plus_game_server_LDADD = \
+ POSIX/libposixdoom.a \
+ SDL/i_network.o \
+ @NET_LIBS@ \
+ @SDL_LIBS@
 
 EXTRA_DIST = \
- r_drawcolumn.inl r_drawflush.inl r_drawspan.inl r_drawcolpipeline.inl icon.c
+ r_drawcolpipeline.inl \
+ r_drawcolumn.inl \
+ r_drawflush.inl \
+ r_drawspan.inl \
+ icon.c