Changeset 66 for abuse/trunkTweet

Timestamp:

Mar 2, 2008, 7:43:35 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Added the proper .h and .hpp files to _SOURCES variables. As a result, "make dist" now generates a buildable tarball.

Location:

abuse/trunk

Files:

• osx/abuse_sdl.pbproj/project.pbxproj (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/cache.hpp (modified) (1 diff)
• src/chars.hpp (modified) (1 diff)
• src/clisp.cpp (modified) (2 diffs)
• src/config.cpp (modified) (1 diff)
• src/exitproc.hpp (moved) (moved from abuse/trunk/src/imlib/exitproc.hpp)
• src/game.cpp (modified) (2 diffs)
• src/game.hpp (modified) (1 diff)
• src/imlib/Makefile.am (modified) (1 diff)
• src/imlib/doscall.hpp (deleted)
• src/imlib/monoprnt.hpp (deleted)
• src/imlib/morph.cpp (modified) (1 diff)
• src/imlib/morph.hpp (modified) (1 diff)
• src/imlib/sdriver.hpp (deleted)
• src/imlib/texture.cpp (modified) (1 diff)
• src/imlib/timer.cpp (deleted)
• src/imlib/timer.hpp (deleted)
• src/isllist_bak.hpp (deleted)
• src/laser.hpp (deleted)
• src/lcaller.hpp (deleted)
• src/lisp (modified) (1 prop)
• src/lmenu.hpp (deleted)
• src/loader2.cpp (modified) (2 diffs)
• src/loader2.hpp (modified) (1 diff)
• src/net/Makefile.am (modified) (1 diff)
• src/net/endian.hpp (deleted)
• src/objects.hpp (modified) (1 diff)
• src/ramfile.hpp (deleted)
• src/sdlport/Makefile.am (modified) (1 diff)
• src/sdlport/jnet.cpp (modified) (1 diff)
• src/sdlport/jnet.hpp (moved) (moved from abuse/trunk/src/imlib/jnet.hpp) (1 diff)
• src/sdlport/joy.hpp (moved) (moved from abuse/trunk/src/imlib/joy.hpp)
• src/sdlport/sound.hpp (moved) (moved from abuse/trunk/src/imlib/sound.hpp)
• src/sdlport/video.cpp (modified) (1 diff)
• src/seq.cpp (modified) (1 diff)
• src/tiles.hpp (deleted)

abuse/trunk/osx/abuse_sdl.pbproj/project.pbxproj

@@ -820 +820 @@
                         refType = 4;
                 };
-                F5ACF28F0305D66801A80002 = {
-                        isa = PBXFileReference;
-                        path = globals.hpp;
-                        refType = 4;
-                };
                 F5ACF2900305D66801A80002 = {
                         isa = PBXFileReference;
@@ -973 +968 @@
                         isa = PBXFileReference;
                         path = scroller.hpp;
-                        refType = 4;
-                };
-                F5ACF2AE0305D66801A80002 = {
-                        isa = PBXFileReference;
-                        path = sdriver.hpp;
                         refType = 4;
                 };

abuse/trunk/src/Makefile.am

@@ -5 +5 @@
 bin_PROGRAMS = abuse
 
-abuse_SOURCES = specache.cpp netcfg.cpp text_gui.cpp innet.cpp \
-        chat.cpp endgame.cpp version.cpp loadgame.cpp profile.cpp \
-        cop.cpp statbar.cpp compiled.cpp ant.cpp sensor.cpp \
-        demo.cpp lcache.cpp nfclient.cpp \
-        username.cpp clisp.cpp gui.cpp transp.cpp collide.cpp trig.cpp \
-        property.cpp cache.cpp particle.cpp objects.cpp \
-        extend.cpp console.cpp ability.cpp items.cpp dev.cpp chars.cpp \
-        level.cpp smallfnt.cpp automap.cpp help.cpp intsect.cpp \
-        loader2.cpp seq.cpp points.cpp fnt6x13.cpp morpher.cpp \
-        menu.cpp director.cpp view.cpp config.cpp game.cpp light.cpp \
-        devsel.cpp crc.cpp gamma.cpp language.cpp
+abuse_SOURCES = \
+    specache.cpp specache.hpp \
+    netcfg.cpp netcfg.hpp \
+    text_gui.cpp text_gui.hpp \
+    innet.cpp \
+    chat.cpp chat.hpp \
+    endgame.cpp \
+    version.cpp \
+    loadgame.cpp loadgame.hpp \
+    profile.cpp profile.hpp \
+    cop.cpp cop.hpp \
+    statbar.cpp \
+    compiled.cpp compiled.hpp \
+    ant.cpp ant.hpp \
+    sensor.cpp \
+    demo.cpp demo.hpp \
+    lcache.cpp lcache.hpp \
+    nfclient.cpp nfclient.hpp \
+    username.cpp \
+    clisp.cpp clisp.hpp \
+    gui.cpp gui.hpp \
+    transp.cpp transp.hpp \
+    collide.cpp \
+    trig.cpp \
+    property.cpp property.hpp \
+    cache.cpp cache.hpp \
+    particle.cpp particle.hpp \
+    objects.cpp objects.hpp \
+    extend.cpp extend.hpp \
+    console.cpp console.hpp \
+    ability.cpp ability.hpp \
+    items.cpp items.hpp \
+    dev.cpp dev.hpp \
+    chars.cpp chars.hpp \
+    level.cpp level.hpp \
+    smallfnt.cpp \
+    automap.cpp automap.hpp \
+    help.cpp help.hpp \
+    intsect.cpp intsect.hpp \
+    loader2.cpp loader2.hpp \
+    seq.cpp seq.hpp \
+    points.cpp points.hpp \
+    fnt6x13.cpp \
+    morpher.cpp morpher.hpp \
+    menu.cpp menu.hpp \
+    director.cpp director.hpp \
+    view.cpp view.hpp \
+    config.cpp config.hpp \
+    game.cpp game.hpp \
+    light.cpp light.hpp \
+    devsel.cpp devsel.hpp \
+    crc.cpp crc.hpp \
+    gamma.cpp gamma.hpp \
+    language.cpp language.hpp \
+    bus_type.hpp stack.hpp id.hpp netface.hpp isllist.hpp sbar.hpp \
+    nfserver.hpp exitproc.hpp \
+    $(NULL)
 
 EXTRALIBS = lisp/liblisp.a sdlport/libsdlport.a imlib/libimlib.a net/libnet.a

abuse/trunk/src/cache.hpp

@@ -14 +14 @@
 
 #include "lisp/lisp.hpp"
+#include "sdlport/sound.hpp"
 
 #include "specs.hpp"
 #include "items.hpp"
-#include "sound.hpp"
 #include "particle.hpp"
 

abuse/trunk/src/chars.hpp

@@ -13 +13 @@
 
 #include "seq.hpp"
-#include "sound.hpp"
+//#include "sound.hpp"
 #include "ability.hpp"
 #include "event.hpp"

abuse/trunk/src/clisp.cpp

@@ -9 +9 @@
 
 #include "config.h"
+
+#include "sdlport/joy.hpp"
 
 #include "ant.hpp"
@@ -24 +26 @@
 #include "loadgame.hpp"
 #include "nfserver.hpp"
-#include "joy.hpp"
 #include "demo.hpp"
 #include "chat.hpp"

abuse/trunk/src/config.cpp

@@ -12 +12 @@
 #include <ctype.h>
 
+#include "sdlport/joy.hpp"
+
 #include "keys.hpp"
 #include "lisp.hpp"
-#include "joy.hpp"
 #include "jwindow.hpp"
 #include "config.hpp"

abuse/trunk/src/game.cpp

@@ -22 +22 @@
 #endif
 
+#include "sdlport/joy.hpp"
+
 #include "game.hpp"
 #include "dev.hpp"
 #include "id.hpp"
-#include "joy.hpp"
 #include "timing.hpp"
 #include "automap.hpp"
@@ -33 +34 @@
 #include "loader.hpp"
 #include "lisp.hpp"
-#include "monoprnt.hpp"
 #include "jrand.hpp"
 #include "config.hpp"

abuse/trunk/src/game.hpp

@@ -20 +20 @@
 #include "fonts.hpp"
 #include "loader.hpp"
-#include "monoprnt.hpp"
 #include "items.hpp"
 #include "jwindow.hpp"

abuse/trunk/src/imlib/Makefile.am

@@ -2 +2 @@
 noinst_LIBRARIES = libimlib.a
 
-libimlib_a_SOURCES = filter.cpp gifread.cpp globals.cpp image.cpp \
-        linked.cpp input.cpp mdlread.cpp palette.cpp ppmread.cpp \
-        include.cpp xwdread.cpp fonts.cpp decoder.cpp loader.cpp \
-        glread.cpp texture.cpp specs.cpp supmorph.cpp image24.cpp \
-        pcxread.cpp timage.cpp jmalloc.cpp jrand.cpp lbmread.cpp \
-        targa.cpp keys.cpp dprint.cpp status.cpp visobj.cpp \
-        packet.cpp readwav.cpp pmenu.cpp scroller.cpp filesel.cpp \
-        tools.cpp guistat.cpp sprite.cpp jwindow.cpp
+libimlib_a_SOURCES = \
+    filter.cpp filter.hpp \
+    gifread.cpp gifread.hpp \
+    globals.cpp \
+    image.cpp image.hpp \
+    linked.cpp linked.hpp \
+    input.cpp input.hpp \
+    mdlread.cpp mdlread.hpp \
+    palette.cpp palette.hpp \
+    ppmread.cpp ppmread.hpp \
+    include.cpp include.hpp \
+    xwdread.cpp xwdread.hpp \
+    fonts.cpp fonts.hpp \
+    decoder.cpp \
+    loader.cpp loader.hpp \
+    glread.cpp glread.hpp \
+    texture.cpp texture.hpp \
+    specs.cpp specs.hpp \
+    supmorph.cpp supmorph.hpp \
+    image24.cpp image24.hpp \
+    pcxread.cpp pcxread.hpp \
+    timage.cpp timage.hpp \
+    jmalloc.cpp jmalloc.hpp \
+    jrand.cpp jrand.hpp \
+    lbmread.cpp lbmread.hpp \
+    targa.cpp targa.hpp \
+    keys.cpp keys.hpp \
+    dprint.cpp dprint.hpp \
+    status.cpp status.hpp \
+    visobj.cpp visobj.hpp \
+    packet.cpp packet.hpp \
+    readwav.cpp readwav.hpp \
+    pmenu.cpp pmenu.hpp \
+    scroller.cpp scroller.hpp \
+    filesel.cpp filesel.hpp \
+    tools.cpp tools.hpp \
+    guistat.cpp guistat.hpp \
+    sprite.cpp sprite.hpp \
+    jwindow.cpp jwindow.hpp \
+    main.hpp macs.hpp video.hpp gifdecod.hpp event.hpp mouse.hpp timing.hpp \
+    jdir.hpp emm.hpp system.h std.h dos.h dir.h errs.h \
+    $(NULL)
 
 INCLUDES = -I$(srcdir)

abuse/trunk/src/imlib/morph.cpp

@@ -7 +7 @@
  *  Jonathan Clark.
  */
+
+/* FIXME: this file is unused */
 
 #include "config.h"

abuse/trunk/src/imlib/morph.hpp

@@ -8 +8 @@
  */
 
+/* FIXME: this file is unused */
+
 #ifndef __MORPH_HPP_
 #define __MORPH_HPP_
 
 #include <stdio.h>
+
 #include "image.hpp"
 #include "palette.hpp"
 #include "macs.hpp"
-#include "monoprnt.hpp"
 #include "specs.hpp"
 #include "filter.hpp"

abuse/trunk/src/imlib/texture.cpp

@@ -16 +16 @@
 #include "macs.hpp"
 #include "event.hpp"
+#include "texture.hpp"
 
 #define SHB 7

abuse/trunk/src/loader2.cpp

@@ -16 +16 @@
 #include "chars.hpp"
 #include "specs.hpp"
-#include "parse.hpp"
 #include "lisp.hpp"
 #include "jrand.hpp"
@@ -25 +24 @@
 #include "dev.hpp"
 #include "light.hpp"
-#include "morph.hpp"
 #include "dprint.hpp"
 #include "particle.hpp"

abuse/trunk/src/loader2.hpp

@@ -12 +12 @@
 
 #include "lisp/lisp.hpp"
+#include "sdlport/sound.hpp"
 
 #include "jwindow.hpp"
-#include "sound.hpp"
 class property_manager;
 extern property_manager *prop;

abuse/trunk/src/net/Makefile.am

@@ -2 +2 @@
 noinst_LIBRARIES = libnet.a
 
-libnet_a_SOURCES = gserver.cpp gclient.cpp fileman.cpp sock.cpp tcpip.cpp
+libnet_a_SOURCES = \
+    gserver.cpp gserver.hpp \
+    gclient.cpp gclient.hpp \
+    fileman.cpp fileman.hpp \
+    sock.cpp sock.hpp \
+    tcpip.cpp tcpip.hpp \
+    indian.hpp ghandler.hpp undrv.hpp \
+    $(NULL)
 
 INCLUDES = -I$(srcdir) -I$(srcdir)/../ -I$(srcdir)/../imlib

abuse/trunk/src/objects.hpp

@@ -12 +12 @@
 #include "input.hpp"
 #include "chars.hpp"
-#include "sound.hpp"
+//#include "sound.hpp"
 #include "morpher.hpp"
 #include "loader2.hpp"

abuse/trunk/src/sdlport/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libsdlport.a
 
-libsdlport_a_SOURCES = video.cpp mouse.cpp event.cpp sound.cpp timing.cpp jdir.cpp joystick.cpp setup.cpp
+libsdlport_a_SOURCES = \
+    video.cpp \
+    mouse.cpp \
+    event.cpp \
+    sound.cpp sound.hpp \
+    timing.cpp \
+    jdir.cpp \
+    joystick.cpp joy.hpp \
+    setup.cpp setup.h \
+    $(NULL)
 libsdlport_a_LIBADD =
 

abuse/trunk/src/sdlport/jnet.cpp

@@ -17 +17 @@
  *  Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  */
+
+/* FIXME: this file is unused */
 
 #include "config.h"

abuse/trunk/src/sdlport/jnet.hpp

@@ -7 +7 @@
  *  Jonathan Clark.
  */
+
+/* FIXME: this file is unused */
 
 #ifndef __NET_HPP_

abuse/trunk/src/sdlport/video.cpp

@@ -31 +31 @@
 #endif  /* HAVE_OPENGL */
 #include "filter.hpp"
-#include "globals.hpp"
 #include "system.h"
 #include "video.hpp"

abuse/trunk/src/seq.cpp

@@ -12 +12 @@
 #include "seq.hpp"
 #include "macs.hpp"
-#include "parse.hpp"
 #include "lisp.hpp"