diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-03 18:13:04 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-03 18:13:04 +0100 |
| commit | c48cf58d531bdde1835a389d883fef08d44f2f62 (patch) | |
| tree | 555e644af13810a863440bcaafa5656ec39a13f9 | |
| parent | 2e913ff4d61087475ddf3d15455a652cb50c0549 (diff) | |
CWS gnumake3: some problems found in rebuild after resync
| -rw-r--r-- | comphelper/Package_inc.mk | 1 | ||||
| -rw-r--r-- | tools/Executable_rscdep.mk | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk index 7c0c3fa71474..dcfb4954efb1 100644 --- a/comphelper/Package_inc.mk +++ b/comphelper/Package_inc.mk @@ -26,6 +26,7 @@ #************************************************************************* $(eval $(call gb_Package_Package,comphelper_inc,$(SRCDIR)/comphelper/inc)) +$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/flagguard.hxx,comphelper/flagguard.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/stlunosequence.hxx,comphelper/stlunosequence.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/documentconstants.hxx,comphelper/documentconstants.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/evtmethodhelper.hxx,comphelper/evtmethodhelper.hxx)) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index abde9af09dfa..8d8c55fa585d 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -56,13 +56,12 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) ifeq ($(HAVE_GETOPT),YES) $(eval $(call gb_Executable_set_cxxflags,rscdep,\ $$(CXXFLAGS) \ -DHAVE_GETOPT \ )) -endif +else $(eval $(call gb_Executable_add_linked_libs,rscdep,\ gnu_getopt \ )) |