projects / packages / aep1000.git / blame
| Commit | Line | Data |
|---|---|---|
| 212bd87f JB |
1 | --- Host/h/aep_i_defs.h Wed Mar 13 12:53:04 2002 |
| 2 | +++ Host/h/aep_i_defs.h Wed Mar 13 12:53:25 2002 | |
| 3 | @@ -285,6 +285,6 @@ | |
| 4 | #define AEP_4000 5 /* Older Board Types With NVM/8M sram */ | |
| 5 | ||
| 6 | ||
| 7 | -#define AEP_DAEMON_SOCKET "/usr/aep/aep_socket" | |
| 8 | +#define AEP_DAEMON_SOCKET "/var/run/aep_socket" | |
| 9 | ||
| 10 | #endif | |
| 11 | --- Host/API/make.conf Wed Mar 13 12:45:42 2002 | |
| 12 | +++ Host/API/make.conf Wed Mar 13 12:56:15 2002 | |
| 13 | @@ -169,7 +169,7 @@ | |
| 14 | Linux:2.2.*:gcc) | |
| 15 | TARGET="libaep.so.1" | |
| 16 | cflags="-Wall -I../h -I./h -I../../common ${ENDIAN_FLAG} ${BITS_FLAG} -D_REENTRANT -fPIC" | |
| 17 | - ldflags="-shared -O-no-undefined -lpthread -lnsl -lrt" | |
| 18 | + ldflags="-shared -O-no-undefined -Wl,-soname=${TARGET}" | |
| 19 | ;; | |
| 20 | ||
| 21 | #------------------------------ | |
| 22 | @@ -178,7 +178,7 @@ | |
| 23 | Linux:2.4.*:gcc) | |
| 24 | TARGET="libaep.so.1" | |
| 25 | cflags="-Wall -I../h -I./h -I../../common ${ENDIAN_FLAG} ${BITS_FLAG} -D_REENTRANT -fPIC" | |
| 26 | - ldflags="-shared -O-no-undefined -lpthread -lnsl -lrt" | |
| 27 | + ldflags="-shared -O-no-undefined -Wl,-soname=${TARGET}" | |
| 28 | ;; | |
| 29 | ||
| 30 | #------------------------------ | |
| 31 | @@ -265,7 +265,7 @@ | |
| 32 | #Here's what we pass to the Compiler and Linker... | |
| 33 | #================================================== | |
| 34 | ||
| 35 | -CFLAGS="${AEPflags} ${cflags} " | |
| 36 | +CFLAGS="${AEPflags} ${cflags} ${RPM_OPT_FLAGS}" | |
| 37 | LDFLAGS="${ldflags}" | |
| 38 | ||
| 39 | export OBJECTS | |
| 40 | --- Host/Daemon/make.conf Wed Mar 13 12:44:17 2002 | |
| 41 | +++ Host/Daemon/make.conf Wed Mar 13 12:44:26 2002 | |
| 42 | @@ -268,7 +268,7 @@ | |
| 43 | #Here's what we pass to the Compiler and Linker... | |
| 44 | #================================================== | |
| 45 | ||
| 46 | -CFLAGS="${AEPflags} ${cflags} " | |
| 47 | +CFLAGS="${AEPflags} ${cflags} ${RPM_OPT_FLAGS}" | |
| 48 | LDFLAGS="${ldflags}" | |
| 49 | ||
| 50 | export OBJECTS | |
| 51 | --- Host/Test/quicktest/make.conf Wed Mar 13 12:54:05 2002 | |
| 52 | +++ Host/Test/quicktest/make.conf Wed Mar 13 12:54:50 2002 | |
| 53 | @@ -171,7 +171,7 @@ | |
| 54 | #------------------------------ | |
| 55 | Linux:2.2.*:gcc) | |
| 56 | cflags="-Wall -I./h -I../../h ${ENDIAN_FLAG} ${BITS_FLAG} -D_REENTRANT -fPIC" | |
| 57 | - ldflags="-lpthread -lnsl -lrt -L. -laep" | |
| 58 | + ldflags="-lpthread -L. -L../../API -laep" | |
| 59 | ;; | |
| 60 | ||
| 61 | #------------------------------ | |
| 62 | @@ -179,7 +179,7 @@ | |
| 63 | #------------------------------ | |
| 64 | Linux:2.4.*:gcc) | |
| 65 | cflags="-Wall -I./h -I../../h ${ENDIAN_FLAG} ${BITS_FLAG} -D_REENTRANT -fPIC" | |
| 66 | - ldflags="-lpthread -lnsl -lrt -L. -laep" | |
| 67 | + ldflags="-lpthread -L. -L../../API -laep" | |
| 68 | ;; | |
| 69 | ||
| 70 | #------------------------------ | |
| 71 | --- Host/versionApp/make.conf Wed Mar 13 13:04:29 2002 | |
| 72 | +++ Host/versionApp/make.conf Wed Mar 13 13:04:24 2002 | |
| 73 | @@ -172,7 +172,7 @@ | |
| 74 | #------------------------------ | |
| 75 | Linux:2.2.*:gcc) | |
| 76 | cflags="-Wall -I../h -I./h ${ENDIAN_FLAG} ${BITS_FLAG} -D_REENTRANT -fPIC" | |
| 77 | - ldflags="-lpthread -lnsl -lrt -L. -laep" | |
| 78 | + ldflags="-lpthread -L. -L../API -laep" | |
| 79 | ;; | |
| 80 | ||
| 81 | #------------------------------ | |
| 82 | @@ -180,7 +180,7 @@ | |
| 83 | #------------------------------ | |
| 84 | Linux:2.4.*:gcc) | |
| 85 | cflags=" -Wall -I../h -I./h ${ENDIAN_FLAG} ${BITS_FLAG} -D_REENTRANT -fPIC" | |
| 86 | - ldflags="-lpthread -lnsl -lrt -L. -laep" | |
| 87 | + ldflags="-lpthread -L. -L../API -laep" | |
| 88 | ;; | |
| 89 | ||
| 90 | #------------------------------ | |
| 91 | --- Host/aeploader/make.conf Wed Mar 13 16:10:55 2002 | |
| 92 | +++ Host/aeploader/make.conf Wed Mar 13 16:11:09 2002 | |
| 93 | @@ -174,7 +174,7 @@ | |
| 94 | #------------------------------ | |
| 95 | Linux:2.2.*:gcc) | |
| 96 | cflags="-Wall -I../h -I../Daemon/h -I../API/h -I../../common ${ENDIAN_FLAG} ${BITS_FLAG} -D_REENTRANT -fPIC" | |
| 97 | - ldflags="-lpthread -lnsl -lrt -L. -laep" | |
| 98 | + ldflags="-lpthread -L. -L../API -laep" | |
| 99 | ;; | |
| 100 | ||
| 101 | #------------------------------ | |
| 102 | @@ -182,7 +182,7 @@ | |
| 103 | #------------------------------ | |
| 104 | Linux:2.4.*:gcc) | |
| 105 | cflags="-Wall -I../h -I../Daemon/h -I../API/h -I../../common ${ENDIAN_FLAG} ${BITS_FLAG} -D_REENTRANT -fPIC" | |
| 106 | - ldflags="-lpthread -lnsl -lrt -L. -laep" | |
| 107 | + ldflags="-lpthread -L. -L../API -laep" | |
| 108 | ;; | |
| 109 | ||
| 110 | #------------------------------ | |
| 111 | --- Host/API/mutex.c Tue Apr 9 16:47:50 2002 | |
| 112 | +++ Host/API/mutex.c Tue Apr 9 16:47:43 2002 | |
| 113 | @@ -306,6 +306,8 @@ | |
| 114 | #else /* ! Win32 */ | |
| 115 | #error No Mutexes implemented for this architecture! | |
| 116 | #endif | |
| 117 | + | |
| 118 | +#if 0 | |
| 119 | int SEM_INIT(sem_t *sem, int pshared, unsigned int value) | |
| 120 | { | |
| 121 | int err; | |
| 122 | @@ -325,8 +327,4 @@ | |
| 123 | {} | |
| 124 | return 0; | |
| 125 | } | |
| 126 | - | |
| 127 | - | |
| 128 | - | |
| 129 | - | |
| 130 | - | |
| 131 | +#endif |