Browse code
fix last commit
| ... | ... |
@@ -1,3 +1,7 @@ |
| 1 |
+Fri Dec 12 10:49:37 EET 2008 (edwin) |
|
| 2 |
+------------------------------------ |
|
| 3 |
+ * libclamav/Makefile.am, libclamav/Makefile.in: fix last commit |
|
| 4 |
+ |
|
| 1 | 5 |
Fri Dec 12 10:28:04 EET 2008 (edwin) |
| 2 | 6 |
------------------------------------ |
| 3 | 7 |
* libclamav/Makefile.am, libclamav/Makefile.in, libclamav/others.c, |
| ... | ... |
@@ -74,6 +74,23 @@ IFACELIBADD = -dlopen libclamunrar_iface.la |
| 74 | 74 |
IFACEDEP = libclamunrar_iface.la |
| 75 | 75 |
endif |
| 76 | 76 |
|
| 77 |
+libclamav_internal_utils_la_SOURCES=str.c \ |
|
| 78 |
+ str.h \ |
|
| 79 |
+ others_common.c \ |
|
| 80 |
+ others.h \ |
|
| 81 |
+ regex/strlcpy.c \ |
|
| 82 |
+ regex/regcomp.c \ |
|
| 83 |
+ regex/regerror.c \ |
|
| 84 |
+ regex/regexec.c \ |
|
| 85 |
+ regex/regfree.c \ |
|
| 86 |
+ regex/cclass.h \ |
|
| 87 |
+ regex/cname.h \ |
|
| 88 |
+ regex/regex.h \ |
|
| 89 |
+ regex/regex2.h \ |
|
| 90 |
+ regex/utils.h |
|
| 91 |
+ |
|
| 92 |
+libclamav_internal_utils_la_LDFLAGS=-static |
|
| 93 |
+libclamav_internal_utils_la_CFLAGS= -fPIC -DPIC |
|
| 77 | 94 |
|
| 78 | 95 |
libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@ |
| 79 | 96 |
libclamav_la_DEPENDENCIES = @LIBLTDL@ $(IFACEDEP) libclamav_internal_utils.la |
| ... | ... |
@@ -270,23 +287,6 @@ version.h.tmp: |
| 270 | 270 |
touch version.h.tmp;\ |
| 271 | 271 |
fi |
| 272 | 272 |
|
| 273 |
-libclamav_internal_utils_la_SOURCES=str.c \ |
|
| 274 |
- str.h \ |
|
| 275 |
- others_common.c \ |
|
| 276 |
- others.h \ |
|
| 277 |
- regex/strlcpy.c \ |
|
| 278 |
- regex/regcomp.c \ |
|
| 279 |
- regex/regerror.c \ |
|
| 280 |
- regex/regexec.c \ |
|
| 281 |
- regex/regfree.c \ |
|
| 282 |
- regex/cclass.h \ |
|
| 283 |
- regex/cname.h \ |
|
| 284 |
- regex/regex.h \ |
|
| 285 |
- regex/regex2.h \ |
|
| 286 |
- regex/utils.h |
|
| 287 |
- |
|
| 288 |
-libclamav_internal_utils_la_LDFLAGS=-static |
|
| 289 |
-libclamav_internal_utils_la_CFLAGS= -fPIC -DPIC |
|
| 290 | 273 |
lib_LTLIBRARIES += libclamav.la |
| 291 | 274 |
noinst_LTLIBRARIES = libclamav_internal_utils.la |
| 292 | 275 |
EXTRA_DIST += regex/engine.c libclamav.map \ |
| ... | ... |
@@ -379,8 +379,25 @@ EXTRA_DIST = $(am__append_4) regex/engine.c libclamav.map \ |
| 379 | 379 |
|
| 380 | 380 |
@ENABLE_UNRAR_TRUE@IFACELIBADD = -dlopen libclamunrar_iface.la |
| 381 | 381 |
@ENABLE_UNRAR_TRUE@IFACEDEP = libclamunrar_iface.la |
| 382 |
+libclamav_internal_utils_la_SOURCES = str.c \ |
|
| 383 |
+ str.h \ |
|
| 384 |
+ others_common.c \ |
|
| 385 |
+ others.h \ |
|
| 386 |
+ regex/strlcpy.c \ |
|
| 387 |
+ regex/regcomp.c \ |
|
| 388 |
+ regex/regerror.c \ |
|
| 389 |
+ regex/regexec.c \ |
|
| 390 |
+ regex/regfree.c \ |
|
| 391 |
+ regex/cclass.h \ |
|
| 392 |
+ regex/cname.h \ |
|
| 393 |
+ regex/regex.h \ |
|
| 394 |
+ regex/regex2.h \ |
|
| 395 |
+ regex/utils.h |
|
| 396 |
+ |
|
| 397 |
+libclamav_internal_utils_la_LDFLAGS = -static |
|
| 398 |
+libclamav_internal_utils_la_CFLAGS = -fPIC -DPIC |
|
| 382 | 399 |
libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@ |
| 383 |
-libclamav_la_DEPENDENCIES = @LIBLTDL@ $(IFACEDEP) |
|
| 400 |
+libclamav_la_DEPENDENCIES = @LIBLTDL@ $(IFACEDEP) libclamav_internal_utils.la |
|
| 384 | 401 |
libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \ |
| 385 | 402 |
-no-undefined $(am__append_6) |
| 386 | 403 |
include_HEADERS = clamav.h |
| ... | ... |
@@ -544,23 +561,6 @@ libclamav_la_SOURCES = \ |
| 544 | 544 |
mpool.c\ |
| 545 | 545 |
mpool.h |
| 546 | 546 |
|
| 547 |
-libclamav_internal_utils_la_SOURCES = str.c \ |
|
| 548 |
- str.h \ |
|
| 549 |
- others_common.c \ |
|
| 550 |
- others.h \ |
|
| 551 |
- regex/strlcpy.c \ |
|
| 552 |
- regex/regcomp.c \ |
|
| 553 |
- regex/regerror.c \ |
|
| 554 |
- regex/regexec.c \ |
|
| 555 |
- regex/regfree.c \ |
|
| 556 |
- regex/cclass.h \ |
|
| 557 |
- regex/cname.h \ |
|
| 558 |
- regex/regex.h \ |
|
| 559 |
- regex/regex2.h \ |
|
| 560 |
- regex/utils.h |
|
| 561 |
- |
|
| 562 |
-libclamav_internal_utils_la_LDFLAGS = -static |
|
| 563 |
-libclamav_internal_utils_la_CFLAGS = -fPIC -DPIC |
|
| 564 | 547 |
noinst_LTLIBRARIES = libclamav_internal_utils.la |
| 565 | 548 |
COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno |
| 566 | 549 |
@MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf |