diff options
| author | Simon Howard | 2012-10-28 23:45:08 +0000 |
|---|---|---|
| committer | Simon Howard | 2012-10-28 23:45:08 +0000 |
| commit | 993315afc4b1fddaf8952e7e55d1373b5052dd7c (patch) | |
| tree | 94aa07d101ddced8404ceaa92ce051ed17fe2a88 /src/Makefile.am | |
| parent | a1b2ce54d02823aa85c7df6aa016c567185451ae (diff) | |
| parent | ad11652dcd8e0923432ad272e6535276c51d39eb (diff) | |
| download | chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.tar.gz chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.tar.bz2 chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.zip | |
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2537
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index af7a43a2..8f393089 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,7 +69,7 @@ m_cheat.c m_cheat.h \ m_config.c m_config.h \ m_controls.c m_controls.h \ m_fixed.c m_fixed.h \ -md5.c md5.h \ +sha1.c sha1.h \ memio.c memio.h \ tables.c tables.h \ v_video.c v_video.h \ @@ -95,6 +95,7 @@ deh_text.c # source files needed for FEATURE_MULTIPLAYER FEATURE_MULTIPLAYER_SOURCE_FILES= \ +aes_prng.c aes_prng.h \ net_client.c net_client.h \ net_common.c net_common.h \ net_dedicated.c net_dedicated.h \ @@ -210,13 +211,13 @@ appdir = $(prefix)/share/applications app_DATA = @PROGRAM_PREFIX@doom.desktop @PROGRAM_PREFIX@doom.desktop : doom.desktop - cp $< $@ + cp doom.desktop $@ screensaverdir = $(prefix)/share/applications/screensavers screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop @PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop - cp $< $@ + cp doom-screensaver.desktop $@ .rc.o: $(WINDRES) $< -o $@ |