bvl: updated OS/2 makefiles, there was a stupid machine dependant declaration

     in them


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@801 67ed7778-7388-44ab-90cf-0a291f65f57c

11 files changed, 35 insertions, 28 deletions

diff --git a/AUTHORS b/AUTHORS
index 4b2641e54..a21a8c04a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,9 +9,9 @@ Matt Martin <matt.martin@ieee.org>
 Fuji DS-7 library
 Bug fixing and GUI features
 
-Mike Labriola <mdlabriola@mindless.com> 
-Extra HTML gallery export options 
- 
+Mike Labriola <mdlabriola@mindless.com>
+Extra HTML gallery export options
+
 Werner Almesberger <almesber@lrc.di.epfl.ch>
 Canon A50 library
 
@@ -120,6 +120,9 @@ Mailinglists, web, FAQ, bug fixing
 Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>
 Olympus C3030Z USB support
 
+Bart van Leeuwen <bart@netage.nl>
+OS/2 Port
+
 If you feel left out, then please
 add yourself to the file "AUTHORS",
 or mail <gphoto-devel@gphoto.org>!
diff --git a/camlibs/barbie/makefile.os2 b/camlibs/barbie/makefile.os2
index 63bfa8cd8..a356fdc44 100644
--- a/camlibs/barbie/makefile.os2
+++ b/camlibs/barbie/makefile.os2
@@ -25,5 +25,5 @@ barbie.def: barbie.o
    @copy barbie.df barbie.def
    @emxexp $** >> barbie.def
 
-..\gpbarbie.dll: barbie.o barbie.def
-   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -Le:\emx\lib -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl ..\..\obj\interface.o -lpthreads -lpthrdrtl -lmt\c
+..\gpbarbie.dll: barbie.o barbie.def ..\..\obj\interface.o
+   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
diff --git a/camlibs/canon/makefile.os2 b/camlibs/canon/makefile.os2
index d853e884f..4df34f115 100644
--- a/camlibs/canon/makefile.os2
+++ b/camlibs/canon/makefile.os2
@@ -37,5 +37,5 @@ canon.def: canon.o
    copy canon.df canon.def
    emxexp $** >> canon.def
 
-..\gpcanon.dll: util.o canon.def serial.o canon.o psa50.o crc.o
-   $(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -Le:\emx\lib -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl ..\..\obj\interface.o -lpthreads -lpthrdrtl -lmt\c
+..\gpcanon.dll: util.o canon.def serial.o canon.o psa50.o crc.o ..\..\obj\interface.o
+   $(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
diff --git a/camlibs/digita/makefile.os2 b/camlibs/digita/makefile.os2
index bd95d511e..48fdbf065 100644
--- a/camlibs/digita/makefile.os2
+++ b/camlibs/digita/makefile.os2
@@ -35,5 +35,5 @@ digita.def: digita.o
    @copy digita.df digita.def
    @emxexp $** >> digita.def
 
-..\gpdigita.dll: digita.o digita.def serial.o commands.o usb.o
-   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -Le:\emx\lib -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl ..\..\obj\interface.o -lpthreads -lpthrdrtl -lmt\c
+..\gpdigita.dll: digita.o digita.def serial.o commands.o usb.o ..\..\obj\interface.o
+   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
diff --git a/camlibs/directory/makefile.os2 b/camlibs/directory/makefile.os2
index 996001635..ec67944ab 100644
--- a/camlibs/directory/makefile.os2
+++ b/camlibs/directory/makefile.os2
@@ -21,5 +21,5 @@ dll: ..\gpdirbrw.dll
 ..\..\obj\directory.o : directory.c directory.h
    @$(CC) -o $@ directory.c $(CCFLAGS)
 
-..\gpdirbrw.dll: ..\..\obj\directory.o ..\..\obj\main.o ..\..\obj\test.o ..\..\obj\script.o
-   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** directory.def -lwrap -Le:\emx\lib -lst\check -lgcc -LE:\NETLABS\GNOME\GPHOTO2\LIB -llibgphoto2 -llibgpio -ldl E:\NETLABS\GNOME\GPHOTO2\obj\interface.o -lpthreads -lpthrdrtl -lmt\c
+..\gpdirbrw.dll: ..\..\obj\directory.o ..\..\obj\main.o ..\..\obj\test.o ..\..\obj\script.o ..\..\obj\interface.o
+   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** directory.def -lwrap -lst\check -lgcc -L..\..\lib -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
diff --git a/camlibs/fujitsu/makefile.os2 b/camlibs/fujitsu/makefile.os2
index 61d2f3d0e..542b814a8 100644
--- a/camlibs/fujitsu/makefile.os2
+++ b/camlibs/fujitsu/makefile.os2
@@ -28,5 +28,5 @@ fujitsu.def: fujitsu.o
    @copy fujitsu.df fujitsu.def
    @emxexp $** >> fujitsu.def
 
-..\gpfujits.dll: fujitsu.o fujitsu.def library.o
-   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -Le:\emx\lib -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl ..\..\obj\interface.o -lpthreads -lpthrdrtl -lmt\c
+..\gpfujits.dll: fujitsu.o fujitsu.def library.o ..\..\obj\interface.o
+   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
diff --git a/camlibs/konica/makefile.os2 b/camlibs/konica/makefile.os2
index 3de146ac4..df8616922 100644
--- a/camlibs/konica/makefile.os2
+++ b/camlibs/konica/makefile.os2
@@ -32,5 +32,5 @@ konica.def: konica.o
    @copy konica.df konica.def
    @emxexp $** >> konica.def
 
-..\gpkonica.dll: konica.o konica.def command.o libary.o
-   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -Le:\emx\lib -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl ..\..\obj\interface.o -lpthreads -lpthrdrtl -lmt\c
+..\gpkonica.dll: konica.o konica.def command.o libary.o ..\..\obj\interface.o
+   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
diff --git a/camlibs/makefile.os2 b/camlibs/makefile.os2
index 9e12e0311..dc15caaff 100644
--- a/camlibs/makefile.os2
+++ b/camlibs/makefile.os2
@@ -13,6 +13,15 @@ end:
   @echo ****
 
 dll:
+  @cd canon
+  @nmake -nologo -f makefile.os2
+  @cd..
+  @cd barbie
+  @nmake -nologo -f makefile.os2
+  @cd..
+  @cd digita
+  @nmake -nologo -f makefile.os2
+  @cd..
   @cd directory
   @nmake -nologo -f makefile.os2
   @cd..
@@ -25,11 +34,6 @@ dll:
   @cd fujitsu
   @nmake -nologo -f makefile.os2
   @cd..
-  @cd digita
-  @nmake -nologo -f makefile.os2
-  @cd..
-  @cd barbie
-  @nmake -nologo -f makefile.os2
-  @cd..
-  @cd canon
-  @nmake -nologo -f makefile.os2
+
+
+
diff --git a/camlibs/panasonic/makefile.os2 b/camlibs/panasonic/makefile.os2
index 166cd1aed..dcb32fcfa 100644
--- a/camlibs/panasonic/makefile.os2
+++ b/camlibs/panasonic/makefile.os2
@@ -29,5 +29,5 @@ panasonic.def: dc1580.o
    copy panasonic.df panasonic.def
    emxexp $** >> panasonic.def
 
-..\gppanson.dll: dc.o panasonic.def dc1580.o
-   $(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -Le:\emx\lib -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl ..\..\obj\interface.o -lpthreads -lpthrdrtl -lmt\c
+..\gppanson.dll: dc.o panasonic.def dc1580.o ..\..\obj\interface.o
+   $(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c
diff --git a/camlibs/sonydscf1/makefile.os2 b/camlibs/sonydscf1/makefile.os2
index 32274176a..5fc33e695 100644
--- a/camlibs/sonydscf1/makefile.os2
+++ b/camlibs/sonydscf1/makefile.os2
@@ -37,5 +37,5 @@ sonydscf1.def: sonydscf1.o
    @copy sonydscf1.df sonydscf1.def
    @emxexp $** >> sonydscf1.def
 
-..\gpdscf1.dll: sonydscf1.o sonydscf1.def command.o chotplay.o getuint.o
-   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -Le:\emx\lib -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl ..\..\obj\interface.o -lpthreads -lpthrdrtl -lmt\c
+..\gpdscf1.dll: sonydscf1.o sonydscf1.def command.o chotplay.o getuint.o ..\..\obj\interface.o
+   @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap-lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl  -lpthreads -lpthrdrtl -lmt\c
diff --git a/frontends/command-line/makefile.os2 b/frontends/command-line/makefile.os2
index c13096e81..dd61ea5bb 100644
--- a/frontends/command-line/makefile.os2
+++ b/frontends/command-line/makefile.os2
@@ -27,4 +27,4 @@ cmdline: ..\..\gphoto2.exe
   @$(CC) -o $@ $** $(CCFLAGS)
 
 ..\..\gphoto2.exe: ..\..\obj\interface.o ..\..\obj\script.o ..\..\obj\main.o ..\..\obj\test.o ..\..\lib\libgphoto2.a ..\..\lib\libgpio.a
-  @$(CC) -O2 $** -o $@ -Zbin-files -Zcrtdll -Zmtd -s -Le:\emx\lib -L..\..\lib -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl
+  @$(CC) -O2 $** -o $@ -Zbin-files -Zcrtdll -Zmtd -s -L..\..\lib -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl