[Liboss-commit] CVS: liboss/lib libossins.c,NONE,1.1 Makefile.am,1.18,1.19 ossinsert.c,1.2,NONE

[Justin <th...@us...>]

Update of /cvsroot/liboss/liboss/lib
In directory usw-pr-cvs1:/tmp/cvs-serv2231/lib

Modified Files:
	Makefile.am 
Added Files:
	libossins.c 
Removed Files:
	ossinsert.c 
Log Message:
little clean up, no need for CFLAGS in lib since CPPFLAGS is identical for now, will fix as I'm able to build and for now I can't get past esddsp.c

--- NEW FILE: libossins.c ---
#include <stdarg.h>

#undef ioctl
#undef open
#undef close

extern int oss_ioctl (int,unsigned long,va_list);
extern int oss_open (const char *,int,va_list);
extern void oss_close (int);

int ioctl (int x, unsigned long y,...)
{
    va_list l;
    va_start(l,y);
    return oss_ioctl(x,y,l);
}

int open (const char* x, int y,...)
{
    va_list l;
    va_start(l,y);
    return oss_open(x,y,l);
}

void close (int x) {oss_close(x);}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.am	30 Oct 2002 23:08:19 -0000	1.18
+++ Makefile.am	5 Nov 2002 16:23:12 -0000	1.19
@@ -2,22 +2,22 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @CFLAGS@ $(ESD_INCS) $(COREAUDIO_CFLAGS) $(DLSYM_UNDERSCORE) -DLIBOSS_INTERNAL
+CFLAGS = $(ESD_INCS) $(COREAUDIO_CFLAGS) $(DLSYM_UNDERSCORE) -DLIBOSS_INTERNAL
 
-lib_LTLIBRARIES = liboss.la ossinsert.la
+lib_LTLIBRARIES = liboss.la libossins.la
 
-liboss_la_SOURCES = esddsp.c
+liboss_la_SOURCES = esddsp.c \
+                    liboss.c
 liboss_la_DEPENDENCIES = 
 liboss_la_LIBADD = $(COREAUDIO_LDFLAGS) $(LIBDL) $(LIBESD)
-
-liboss_la_LDFLAGS = -no-undefined \
+liboss_la_LDFLAGS = -export-dynamic \
                     -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-ossinsert_la_SOURCES = ossinsert.c
-ossinsert_la_DEPENDENCIES = liboss.la
-ossinsert_la_LIBADD = -L .libs -loss
-ossinsert_la_LDFLAGS = -no-undefined \
-                    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libossins_la_SOURCES = libossins.c
+libossins_la_DEPENDENCIES = liboss.la
+libossins_la_LIBADD = $(top_builddir)/lib/liboss.la
+libossins_la_LDFLAGS = -export-dynamic \
+                       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 
 include_HEADERS  = 

--- ossinsert.c DELETED ---